| 1 |
commit: 0a4046643fca127fa1198b7fc953825d659ed92c |
| 2 |
Author: Ben Kohler <bkohler <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 12 16:33:27 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 12 19:41:07 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0a404664 |
| 7 |
|
| 8 |
rc-update.sh: fix rc-update calls to work inside chroot |
| 9 |
|
| 10 |
When "rc-update del service" is called without a runlevel specified, it |
| 11 |
removes the service from the current runlevel which may or may not be |
| 12 |
correct within the chroot. This commit adds --all to ensure that these |
| 13 |
rc-update calls actually take effect. |
| 14 |
|
| 15 |
(cherry picked from commit 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3) |
| 16 |
|
| 17 |
targets/support/rc-update.sh | 11 +++++------ |
| 18 |
1 file changed, 5 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh |
| 21 |
index c3e8ed9c..f2de50e0 100755 |
| 22 |
--- a/targets/support/rc-update.sh |
| 23 |
+++ b/targets/support/rc-update.sh |
| 24 |
@@ -11,12 +11,11 @@ fi |
| 25 |
|
| 26 |
if [ "${clst_spec_prefix}" == "livecd" ] |
| 27 |
then |
| 28 |
- # default programs that we always want to start |
| 29 |
- rc-update del iptables |
| 30 |
- rc-update del netmount |
| 31 |
- rc-update del keymaps |
| 32 |
- rc-update del serial |
| 33 |
- rc-update del consolefont |
| 34 |
+ rc-update --all del iptables |
| 35 |
+ rc-update --all del netmount |
| 36 |
+ rc-update --all del keymaps |
| 37 |
+ rc-update --all del serial |
| 38 |
+ rc-update --all del consolefont |
| 39 |
# We need to add this one, unconditionally |
| 40 |
rc-update add autoconfig default |
| 41 |
[[ -e /etc/init.d/splash ]] && rc-update add splash default |
Archives