projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian'
[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
03cd679
..
0ba3c7f
100644
(file)
--- a/
debian/patches/27_support_static_ip.patch
+++ b/
debian/patches/27_support_static_ip.patch
@@
-6,8
+6,10
@@
@DPATCH@
@DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: live-boot-grml/scripts/live
+===================================================================
+--- live-boot-grml.orig/scripts/live 2011-12-06 22:10:37.000000000 +0100
++++ live-boot-grml/scripts/live 2011-12-06 22:10:39.000000000 +0100
@@ -110,9 +110,8 @@
;;
@@ -110,9 +110,8 @@
;;
@@
-37,7
+39,7
@@
export STATICIP
;;
export STATICIP
;;
-@@ -
667,6 +662
,24 @@
+@@ -
723,6 +718
,24 @@
return 0
}
return 0
}
@@
-62,7
+64,7
@@
do_netsetup ()
{
modprobe -q af_packet # For DHCP
do_netsetup ()
{
modprobe -q af_packet # For DHCP
-@@ -
677,9 +690
,19 @@
+@@ -
733,9 +746
,19 @@
[ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
[ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
@@
-85,7
+87,7
@@
# support for Syslinux IPAPPEND parameter
# support for Syslinux IPAPPEND parameter
-@@ -7
22,7 +745
,7 @@
+@@ -7
78,7 +801
,7 @@
if [ "$bootif_mac" = "$current_mac" ]
then
if [ "$bootif_mac" = "$current_mac" ]
then
@@
-94,7
+96,7
@@
break
fi
fi
break
fi
fi
-@@ -7
34,12 +757
,7 @@
+@@ -7
90,12 +813
,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=..."
# 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
+110,7
@@
fi
# split args of ethdevice=eth0,eth1 into "eth0 eth1"
fi
# split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -
747,38 +765
,27 @@
+@@ -
803,38 +821
,27 @@
devlist="$devlist $device"
done
devlist="$devlist $device"
done