Fixed DHCP for eth0->eth3 in livecdfs-update.sh and also changed stage3 target to...

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

diff --git a/ChangeLog b/ChangeLog
index 62482ba9ef425069504fbb3bb886671002e003dc..bd145359b058d41ecca86897acc5c826173d650b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.141 2005/01/10 01:16:07 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.142 2005/01/11 13:12:36 wolf31o2 Exp $
+
+  11 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/livecdfs-update.sh,
+  targets/stage3/stage3-chroot.sh:
+  Fixed DHCP for eth0->eth3 in livecdfs-update.sh and also changed stage3
+  target to use emerge -e when building. This is only temporary until the
+  bootstrap.sh script can be fixed or another solution can be decided upon.
 
   09 Jan 2005; John Davis <zhen@gentoo.org> targets/embedded/embedded.sh,
   +targets/embedded/kmerge.sh:

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 67b53bba45604a632f721ee93c3c3433a489893c..3f3fcc80ad10495347967dc43527ece13d54cd15 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 Foundation
 # 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.26 2005/01/05 20:18:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.27 2005/01/11 13:12:36 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -76,10 +76,13 @@ echo "gentoo" > /etc/dnsdomainname
 sed -i 's:localhost:livecd.gentoo localhost:' /etc/hosts
 
 # setup dhcp on all detected ethernet devices
-echo "ifconfig_eth0( \"dhcp\" )" > /etc/conf.d/net
-echo "ifconfig_eth1( \"dhcp\" )" >> /etc/conf.d/net
-echo "ifconfig_eth2( \"dhcp\" )" >> /etc/conf.d/net
-echo "ifconfig_eth3( \"dhcp\" )" >> /etc/conf.d/net
+echo "iface_eth0=\"dhcp\""> /etc/conf.d/net
+echo "iface_eth1=\"dhcp\"" >> /etc/conf.d/net
+echo "iface_eth2=\"dhcp\"" >> /etc/conf.d/net
+echo "iface_eth3=\"dhcp\"" >> /etc/conf.d/net
+
+# add this for hwsetup/mkx86config
+mkdir -p /etc/sysconfig
 
 # gpm fixes
 [ -e /etc/conf.d/gpm ] && sed -i -e 's:#MOUSE=imps2:MOUSE=imps2:' \

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index 90f9d8e451cb5c4da23bbfafa063bf1aae583667..57681b45b21a69a82c15c558538d59d058ca3eec 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.13 2004/11/23 00:02:57 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.14 2005/01/11 13:12:36 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -45,4 +45,4 @@ then
        sleep 15
 fi
 
-emerge ${clst_myemergeopts} system || exit 1
+emerge -e ${clst_myemergeopts} system || exit 1