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

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index ca1f9c4..f8aef45 100644
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -10,32 +10,16 @@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
 --- /dev/null
-+++ b/scripts/live-bottom/23networking_grml
-@@ -0,0 +1,107 @@
++++ 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
@@ -119,3 +103,16 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +
 +    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"