Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Thu, 12 Oct 2017 19:41:40
Message-Id: 1507837162.0f17e92e40d41c54af7bc863f033f1fdc61f9bf3.robbat2@gentoo
1 commit: 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3
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:39:22 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0f17e92e
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 targets/support/rc-update.sh | 11 +++++------
16 1 file changed, 5 insertions(+), 6 deletions(-)
17
18 diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
19 index c3e8ed9c..f2de50e0 100755
20 --- a/targets/support/rc-update.sh
21 +++ b/targets/support/rc-update.sh
22 @@ -11,12 +11,11 @@ fi
23
24 if [ "${clst_spec_prefix}" == "livecd" ]
25 then
26 - # default programs that we always want to start
27 - rc-update del iptables
28 - rc-update del netmount
29 - rc-update del keymaps
30 - rc-update del serial
31 - rc-update del consolefont
32 + rc-update --all del iptables
33 + rc-update --all del netmount
34 + rc-update --all del keymaps
35 + rc-update --all del serial
36 + rc-update --all del consolefont
37 # We need to add this one, unconditionally
38 rc-update add autoconfig default
39 [[ -e /etc/init.d/splash ]] && rc-update add splash default