commit:     0a4046643fca127fa1198b7fc953825d659ed92c
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Thu Oct 12 16:33:27 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 19:41:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0a404664

rc-update.sh: fix rc-update calls to work inside chroot

When "rc-update del service" is called without a runlevel specified, it
removes the service from the current runlevel which may or may not be
correct within the chroot.  This commit adds --all to ensure that these
rc-update calls actually take effect.

(cherry picked from commit 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3)

 targets/support/rc-update.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index c3e8ed9c..f2de50e0 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -11,12 +11,11 @@ fi
 
 if [ "${clst_spec_prefix}" == "livecd" ]
 then
-       # default programs that we always want to start
-       rc-update del iptables
-       rc-update del netmount
-       rc-update del keymaps
-       rc-update del serial
-       rc-update del consolefont
+       rc-update --all del iptables
+       rc-update --all del netmount
+       rc-update --all del keymaps
+       rc-update --all del serial
+       rc-update --all del consolefont
        # We need to add this one, unconditionally
        rc-update add autoconfig default
        [[ -e /etc/init.d/splash ]] && rc-update add splash default

Reply via email to