bugfixes for #61537 and #61779

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@430 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 34d51633430761ba315febb62b62f11c08d0909e..3e2c1322131f0601a1b26c3aee474f7dc52ceb92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # 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.78 2004/08/13 16:00:47 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.79 2004/08/31 01:40:24 zhen Exp $
+
+  30 Aug 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript-support/livecdfs-update.sh, targets/grp/grp-chroot.sh:
+  bugfixes for #61537 and #61779
 
   13 Aug 2004; John Davis <zhen@gentoo.org> +files/catalyst.1,
   modules/generic_stage_target.py, modules/livecd_stage2_target.py,

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 7aa159a20247ead95712180058a56e8123713cc6..13d57e4648c072dd81382d85fd6b0acd06de0b6b 100755 (executable)
--- 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.10 2004/08/02 23:48:15 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.11 2004/08/31 01:40:24 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -16,6 +16,19 @@ fi
 # fix /etc/issue for mingetty and friends
 echo "This is \n.gentoo (\s \m \r) \t" > /etc/issue
 
+# default programs that we always want to start
+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
+rc-update add pwgen default
+[ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default
+
 # switch the order of rcadd/ rcdel
 if [ -n "${clst_livecd_rcadd}" ] || [ -n "${clst_livecd_rcdel}" ]
 then
@@ -36,19 +49,6 @@ then
        fi
 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
-rc-update add pwgen default
-[ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default
-
 rm -rf /etc/localtime
 cp /usr/share/zoneinfo/GMT /etc/localtime
 echo "livecd" > /etc/hostname

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 2564ad4c618947407a721598225503e6100dc90b..0a199eb585e05fee3d9e6603e3ecd34f5cadfb68 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.5 2004/07/12 15:01:17 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.6 2004/08/31 01:40:24 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -9,7 +9,6 @@ source /etc/profile
 if [ -f /tmp/envscript ]
 then
        source /tmp/envscript
-       rm -f /tmp/envscript
 fi
 
 if [ -n "${clst_CCACHE}" ]