projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for presence of /tmp/net-${device}.conf before sourcing it [Closes: issue1196]
[live-boot-grml.git]
/
debian
/
patches
/
27_support_static_ip.patch
diff --git
a/debian/patches/27_support_static_ip.patch
b/debian/patches/27_support_static_ip.patch
index
4c6896f
..
0bef1cb
100644
(file)
--- 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"
fi
# split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -374,38 +397,2
7
@@
+@@ -374,38 +397,2
9
@@
devlist="$devlist $device"
done
devlist="$devlist $device"
done
@@
-110,7
+110,9
@@
- export DEVICE="$dev"
- break
+ IPV4ADDR="0.0.0.0"
- 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
+ if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
+ export DEVICE="$dev $DEVICE"
+ # break # exit loop as we just use the irst