From: Michael Prokop <mika@grml.org>
Date: Mon, 23 Jul 2012 15:06:28 +0000 (+0200)
Subject: Check for presence of /tmp/net-${device}.conf before sourcing it [Closes: issue1196]
X-Git-Tag: v3.0_a27-1+grml.4~1
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=6d32dfe093885e3a10150ecc986501d7cb1c7d01;hp=a98122bd7721d262f12e6dfeaedad5337fd6b606;p=live-boot-grml.git

Check for presence of /tmp/net-${device}.conf before sourcing it [Closes: issue1196]

Quoting Marc from issue1196:

| in recent busyboxes, sourcing a non-existent file makes busybox
| (silently?) exit, which in case of scripts/live leads to an immediate kernel
| panic since the root fs is not yet mounted.

Thanks: Marc 'Zugschlus' Haber for the bugreport and debugging this issue
---

diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch
index 4c6896f..0bef1cb 100644
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -79,7 +79,7 @@
  	fi
  
  	# split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -374,38 +397,27 @@
+@@ -374,38 +397,29 @@
  		devlist="$devlist $device"
  	done
  
@@ -110,7 +110,9 @@
 -			export DEVICE="$dev"
 -			break
 +		IPV4ADDR="0.0.0.0"
-+		. /tmp/net-${device}.conf
++		if [ -e "/tmp/net-${device}.conf" ]; then
++			. /tmp/net-${device}.conf
++		fi
 +		if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
 +			export DEVICE="$dev $DEVICE"
 +			# break  # exit loop as we just use the irst