Stupid me forgot the patch...

-- 
Anton Lundin    +46702-161604
--- live        2007-11-22 23:23:30.000000000 +0100
+++ live.ip=    2007-11-22 23:23:11.000000000 +0100
@@ -635,11 +635,37 @@
        udevtrigger
        udevsettle
 
-       ipconfig ${DEVICE} | tee /netboot.config
+       case ${IPOPTS} in
+               none|off)
+                       # Do nothing
+                       ;;
+               ""|on|any)
+                       # Bring up device
+                       ipconfig ${DEVICE}| tee /netboot.config
+                       ;;
+               dhcp|bootp|rarp|both)
+                       ipconfig -c ${IPOPTS} -d ${DEVICE}| tee /netboot.config
+                       ;;
+               *)
+                       ipconfig -d $IPOPTS| tee /netboot.config
+
+                       # grab device entry from ip option
+                       NEW_DEVICE=${IPOPTS#*:*:*:*:*:*}
+                       if [ "${NEW_DEVICE}" != "${IPOPTS}" ]; then
+                               NEW_DEVICE=${NEW_DEVICE%:*}
+                       else
+                               # wrong parse, possibly only a partial string
+                               NEW_DEVICE=
+                       fi
+                       if [ -n "${NEW_DEVICE}" ]; then
+                               DEVICE="${NEW_DEVICE}"
+                       fi
+                       ;;
+       esac
 
        # source relevant ipconfig output
        OLDHOSTNAME=${HOSTNAME}
-       . /tmp/net-${DEVICE}.conf
+       . /tmp/net-*.conf
        [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
        export HOSTNAME
 

Attachment: pgpQgnfVdZMh3.pgp
Description: PGP signature

_______________________________________________
debian-live-devel mailing list
debian-live-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel

Reply via email to