r599 - x86/trunk/scripts

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sat Aug 27 09:14:47 PDT 2005


Author: justin
Date: 2005-08-27 10:14:47 -0600 (Sat, 27 Aug 2005)
New Revision: 599

Modified:
   x86/trunk/scripts/net-setup
Log:
Changed net-setup to again timeout at the main menu, and if it times out, to activate eth0 with dhcpcd to permit it's use as a bootscript.

Modified: x86/trunk/scripts/net-setup
===================================================================
--- x86/trunk/scripts/net-setup	2005-08-27 00:54:55 UTC (rev 598)
+++ x86/trunk/scripts/net-setup	2005-08-27 16:14:47 UTC (rev 599)
@@ -390,7 +390,7 @@
 DEVLIST="$DEVLIST ppp-modem \"Configure a dial-up Modem\" ppp-gprs \"Configure a GPRS Modem\""
 
 DLG_COMMAND="dialog --title \"Network Configuration\" --default-item eth0 \
-       	--menu \"Select the network device to configure:\" \
+       	--timeout 30 --menu \"Select the network device to configure:\" \
 	0 0 0 $DEVLIST"
 DEV=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
 unset EDEV EDEVSTATUS DEVLIST DLG_COMMAND
@@ -405,6 +405,17 @@
 		ppp_gprs_menu;
 		exit 0
 	fi
+        # If the menu times out, activate eth0 with dhcpcd and exit.
+        if [ "$DEV" == "timeout" ] ; then
+                DEV="eth0"
+                set_devvars;
+                rm -f $ETHXCFG
+                echo "SERVICE=dhcpcd" > $ETHXCFG
+                echo "DHCP_START=\"\"" >> $ETHXCFG
+                echo "DHCP_STOP=\"-k\"" >> $ETHXCFG
+                $IFUP $DEV
+                exit 0
+        fi
 	
 	# If not ppp-modem or ppp-gprs, then network device to configure
 	set_devvars;




More information about the livecd mailing list