From: John P. Davis Date: Tue, 13 Jul 2004 14:06:44 +0000 (+0000) Subject: rcadd is smarter X-Git-Tag: CATALYST_2_0_6_916~959 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c372a0401271631fee8f5a6f7ffebf9ec64e769;p=catalyst.git rcadd is smarter git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@414 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index af39f8ec..7144144e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.70 2004/07/12 15:01:17 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.71 2004/07/13 14:06:44 zhen Exp $ + + 13 Jul 2004; livecd/runscript-support/livecdfs-update.sh: + changed the behavior of rcadd/ rcdel. it was getting hokey to have to add the + default rc'ed programs when only one change was required to rcadd. so I + changed it so that the defaults are *always* loaded and specified additions/ + deletions are just added on top of those. 12 Jul 2004; John Davis catalyst, targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index 04147d64..c648c02b 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.6 2004/06/13 15:48:51 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.7 2004/07/13 14:06:44 zhen Exp $ /usr/sbin/env-update source /etc/profile @@ -33,20 +33,19 @@ then rc-update del "${x%%:*}" "${x##*:}" done fi - -else - # use the defaults if nothing else is specified - rc-update del iptables default - rc-update del netmount default - #rc-update add hotplug default - #rc-update add kudzu default - rc-update add autoconfig default - rc-update del keymaps - rc-update del consolefont - rc-update add metalog default - rc-update add modules default - [ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default fi + +# always add the defaults +rc-update del iptables default +rc-update del netmount default +# rc-update add hotplug default +# rc-update add kudzu default +rc-update add autoconfig default +rc-update del keymaps +rc-update del consolefont +rc-update add metalog default +rc-update add modules default +[ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default rm -rf /etc/localtime cp /usr/share/zoneinfo/GMT /etc/localtime