X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F15_networking_grml.patch;h=f8aef45e4a969ef4e0a39d9e91ba82f49aa0463a;hb=61895ec815db2d6dc078873149f7bc8118f9d055;hp=fd257e1a3ba8ee44f061adf75075c3786f283e6c;hpb=bcb17b6d4411efd067d5704e0c318e029f6448d3;p=live-boot-grml.git

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index fd257e1..f8aef45 100644
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -9,35 +9,17 @@
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
-Index: b/scripts/live-bottom/23networking_grml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/scripts/live-bottom/23networking_grml	2011-07-24 22:08:07.000000000 +0200
-@@ -0,0 +1,107 @@
+--- /dev/null
++++ b/scripts/boot/9990-grml-networking.sh
+@@ -0,0 +1,93 @@
 +#!/bin/sh
 +
 +#set -e
 +
-+# initramfs-tools header
-+
-+PREREQ=""
-+
-+prereqs()
-+{
-+   echo "${PREREQ}"
-+}
-+
-+case "${1}" in
-+   prereqs)
-+      prereqs
-+      exit 0
-+   ;;
-+esac
-+
-+. /scripts/live-functions
++Grml_Networking () {
 +
 +if [ -n "${NONETWORKING}" ]; then
-+   exit 0
++   return 0
 +fi
 +
 +modprobe af_packet # req'd for DHCP
@@ -81,7 +63,7 @@ Index: b/scripts/live-bottom/23networking_grml
 +
 +    # NODHCP or a previously run ipconfig mean that ifupdown should never
 +    # touch this interface (IP-stack wise).
-+    netconfig=/tmp/net-${interface}.conf
++    netconfig=/run/net-${interface}.conf
 +    if [ -n "$NODHCP" ] || [ -e "${netconfig}" ]; then
 +        method="manual"
 +    fi
@@ -121,3 +103,16 @@ Index: b/scripts/live-bottom/23networking_grml
 +
 +    echo>> $IFFILE
 +done
++
++}
+--- a/scripts/boot/9990-main.sh
++++ b/scripts/boot/9990-main.sh
+@@ -197,6 +197,8 @@
+ 
+ 	Swap
+ 
++	Grml_Networking
++
+ 	case "${UNIONFS}" in
+ 		unionfs-fuse)
+ 			umount "${rootmnt}/dev"