X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F15_networking_grml.patch;h=e71fab63bb005e9ce8645c9cfdc0fbeb98f8cde6;hb=eae42969c6f684a71e2aa812eaa449f3e64a33fc;hp=ca1f9c4a98739bc0ac66222dcec49ecc4038d311;hpb=8b51f6996425b853e0d0dae42a34aa1be4d37901;p=live-boot-grml.git

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index ca1f9c4..e71fab6 100644
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -10,29 +10,13 @@
 
 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
@@ -119,3 +103,18 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +
 +    echo>> $IFFILE
 +done
++
++}
+diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
+index ef41fb0..2af5eb6 100755
+--- a/scripts/boot/9990-main.sh
++++ b/scripts/boot/9990-main.sh
+@@ -194,6 +194,8 @@ Main ()
+ 
+ 	Swap
+ 
++	Grml_Networking
++
+ 	case "${UNIONFS}" in
+ 		unionfs-fuse)
+ 			umount "${rootmnt}/dev"