From 70acf4adada647e5e23e41970d335ef7453ff3f9 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 9 May 2006 12:20:07 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1131 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- targets/support/livecdfs-update.sh | 9 +-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b348828..521faea3 100644 --- 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 + 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 modules/catalyst_lock.py: recursive directory create diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index c1861aac..468cbc01 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -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 -- 2.26.2