aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gmail.com>2017-10-12 11:33:27 -0500
committerRobin H. Johnson <robbat2@gentoo.org>2017-10-12 12:41:07 -0700
commit0a4046643fca127fa1198b7fc953825d659ed92c (patch)
tree226eaae2219c4c16cfcaf0f384e6004a16647587
parentstage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for setup_gcc() (diff)
downloadcatalyst-0a4046643fca127fa1198b7fc953825d659ed92c.tar.gz
catalyst-0a4046643fca127fa1198b7fc953825d659ed92c.tar.bz2
catalyst-0a4046643fca127fa1198b7fc953825d659ed92c.zip
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)
-rwxr-xr-xtargets/support/rc-update.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index c3e8ed9..f2de50e 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