Removed portion of livecdfs-update.sh that created /etc/conf.d/net as it is no longer...
authorChris Gianelloni <wolf31o2@gentoo.org>
Tue, 9 May 2006 12:20:07 +0000 (12:20 +0000)
committerChris Gianelloni <wolf31o2@gentoo.org>
Tue, 9 May 2006 12:20:07 +0000 (12:20 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1131 d1e1f19c-881f-0410-ab34-b69fee027534

ChangeLog
targets/support/livecdfs-update.sh

index 4b348828c3c31b00a612f2cdb1fef4002cd31b7b..521faea3f5cfdfa5ea3c3e660a895355a25a1bd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.615 2006/05/08 17:51:00 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.616 2006/05/09 12:20:07 wolf31o2 Exp $
+
+  09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Removed portion of livecdfs-update.sh that created /etc/conf.d/net as it is
+  no longer necessary and can cause possible problems with Installer-based
+  installs.
 
   08 May 2006; Eric Edgar <rocket@gentoo.org> modules/catalyst_lock.py:
   recursive directory create
index c1861aacb532502604908dcf45eee59d9ea42e1c..468cbc01da3c0de9e8aa384d8ff173f805bb3e27 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.46 2006/04/25 15:17:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.47 2006/05/09 12:20:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -61,13 +61,6 @@ then
        sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
 fi
 
-# Setup DHCP on all detected ethernet devices
-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
-echo "iface_eth4=\"dhcp\"" >> /etc/conf.d/net
-
 # Setup links for ethernet devices
 cd /etc/init.d
 ln -sf net.lo net.eth1