From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E5431396D9 for ; Thu, 12 Oct 2017 19:41:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE24FE0BF4; Thu, 12 Oct 2017 19:41:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE0A9E0BF4 for ; Thu, 12 Oct 2017 19:41:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A123733BE2E for ; Thu, 12 Oct 2017 19:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 332C9908D for ; Thu, 12 Oct 2017 19:41:37 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1507837162.0f17e92e40d41c54af7bc863f033f1fdc61f9bf3.robbat2@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/rc-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3 X-VCS-Branch: master Date: Thu, 12 Oct 2017 19:41:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5ba6c475-6cda-407e-9faa-da3d03284d26 X-Archives-Hash: f24240e73a3b595745ad7757f47e8456 commit: 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3 Author: Ben Kohler gmail com> AuthorDate: Thu Oct 12 16:33:27 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Oct 12 19:39:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0f17e92e 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. 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