[or-cvs] r11399: Use dhcpcd on tiny instead of dhcp to be more robust. There (in incognito/trunk: . arch/x86 root_overlay/etc/conf.d)

[double at seul.org]

Author: double
Date: 2007-09-07 11:01:23 -0400 (Fri, 07 Sep 2007)
New Revision: 11399

Modified:
   incognito/trunk/ChangeLog
   incognito/trunk/arch/x86/livecd-stage1-tiny.spec
   incognito/trunk/root_overlay/etc/conf.d/net
Log:
Use dhcpcd on tiny instead of dhcp to be more robust. There are reports of NICs dropping out and dhcp not retrieving the IP address again.


Modified: incognito/trunk/ChangeLog
===================================================================
--- incognito/trunk/ChangeLog	2007-09-07 12:30:50 UTC (rev 11398)
+++ incognito/trunk/ChangeLog	2007-09-07 15:01:23 UTC (rev 11399)
@@ -1,3 +1,9 @@
+changes since 20070824.1:
+
+	- On tiny changed back from dhcp to dhcpcd as it is more robust and
+	some cards drop link status after the initial IP address. Full needs
+	to use dhcp because that is what NetworkManager uses.
+
 4 Sep 2007
 20070824.1 changes since r200:
 

Modified: incognito/trunk/arch/x86/livecd-stage1-tiny.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1-tiny.spec	2007-09-07 12:30:50 UTC (rev 11398)
+++ incognito/trunk/arch/x86/livecd-stage1-tiny.spec	2007-09-07 15:01:23 UTC (rev 11399)
@@ -87,7 +87,7 @@
 	app-portage/gentoolkit
 	net-dialup/bpalogin
 	net-dialup/mingetty
-	net-misc/dhcp
+	net-misc/dhcpcd
 	net-misc/iputils
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant

Modified: incognito/trunk/root_overlay/etc/conf.d/net
===================================================================
--- incognito/trunk/root_overlay/etc/conf.d/net	2007-09-07 12:30:50 UTC (rev 11398)
+++ incognito/trunk/root_overlay/etc/conf.d/net	2007-09-07 15:01:23 UTC (rev 11399)
@@ -1,8 +1,11 @@
 # Do not clobber the static resolv.conf.
 dhcp="nodns"
 
-modules=( "wpa_supplicant" "dhclient" )
+modules=( "wpa_supplicant" )
+[[ -x /sbin/dhclient ]] && \
+	modules=( "wpa_supplicant" "dhclient" )
 
+
 # Randomize MAC address, unless using QEMU
 grep macchanger /proc/cmdline >/dev/null
 if [[ $? -eq 0 ]]; then