X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F27_support_static_ip.patch;h=a3fbdb50cee2ce859a80382732ba7af7552a1a73;hb=a488db657ecb072da4144790ccdeae04616b409f;hp=03cd679d251ca265f49270e03b36397202fdd12d;hpb=7f62705bb65c0217c4b9af29420cc11e885c41f0;p=live-boot-grml.git

diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch
index 03cd679..a3fbdb5 100644
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -8,36 +8,7 @@
 
 --- a/scripts/live
 +++ b/scripts/live
-@@ -110,9 +110,8 @@
- 				;;
- 
- 			ethdevice=*)
--				DEVICE="${ARGUMENT#ethdevice=}"
--				ETHDEVICE="${DEVICE}"
--				export DEVICE ETHDEVICE
-+				ETHDEVICE="${ARGUMENT#ethdevice=}"
-+				export ETHDEVICE
- 				;;
- 
- 			ethdevice-timeout=*)
-@@ -179,13 +178,9 @@
- 				;;
- 
- 			ip=*)
--				STATICIP="${ARGUMENT#ip=}"
--
--				if [ -z "${STATICIP}" ]
--				then
--					STATICIP="frommedia"
--				fi
--
-+				# copy complete ip=args into staticip, and
-+				# keep multiple uses.
-+				STATICIP="${STATICIP} ${ARGUMENT}"
- 				export STATICIP
- 				;;
- 
-@@ -667,6 +662,24 @@
+@@ -294,6 +294,24 @@
  	return 0
  }
  
@@ -62,7 +33,7 @@
  do_netsetup ()
  {
  	modprobe -q af_packet # For DHCP
-@@ -677,9 +690,19 @@
+@@ -304,9 +322,19 @@
  	[ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
  	echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
  
@@ -85,7 +56,7 @@
  
  
  	# support for Syslinux IPAPPEND parameter
-@@ -722,7 +745,7 @@
+@@ -349,7 +377,7 @@
  
  				if [ "$bootif_mac" = "$current_mac" ]
  				then
@@ -94,7 +65,7 @@
  					break
  				fi
  			fi
-@@ -734,12 +757,7 @@
+@@ -361,12 +389,7 @@
  	# for *every* present network device (except for loopback of course)
  	if [ -z "$ETHDEVICE" ] ; then
  		echo "If you want to boot from a specific device use bootoption ethdevice=..."
@@ -108,7 +79,7 @@
  	fi
  
  	# split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -747,38 +765,27 @@
+@@ -374,43 +397,34 @@
  		devlist="$devlist $device"
  	done
  
@@ -139,7 +110,9 @@
 -			export DEVICE="$dev"
 -			break
 +		IPV4ADDR="0.0.0.0"
-+		. /tmp/net-${device}.conf
++		if [ -e "/run/net-${device}.conf" ]; then
++			. /run/net-${device}.conf
++		fi
 +		if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
 +			export DEVICE="$dev $DEVICE"
 +			# break  # exit loop as we just use the irst
@@ -161,3 +134,40 @@
  
  	for interface in ${DEVICE}; do
  		# source relevant ipconfig output
+ 		OLDHOSTNAME=${HOSTNAME}
+-		[ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
++		[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
+ 		[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
+ 		export HOSTNAME
+ 
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -93,9 +93,8 @@
+ 				;;
+ 
+ 			ethdevice=*)
+-				DEVICE="${ARGUMENT#ethdevice=}"
+-				ETHDEVICE="${DEVICE}"
+-				export DEVICE ETHDEVICE
++				ETHDEVICE="${ARGUMENT#ethdevice=}"
++				export ETHDEVICE
+ 				;;
+ 
+ 			ethdevice-timeout=*)
+@@ -162,13 +161,9 @@
+ 				;;
+ 
+ 			ip=*)
+-				STATICIP="${ARGUMENT#ip=}"
+-
+-				if [ -z "${STATICIP}" ]
+-				then
+-					STATICIP="frommedia"
+-				fi
+-
++				# copy complete ip=args into staticip, and
++				# keep multiple uses.
++				STATICIP="${STATICIP} ${ARGUMENT}"
+ 				export STATICIP
+ 				;;
+