update our patches on top of Debian's 4.0~alpha19

[live-boot-grml.git] / debian / patches / 15_networking_grml.patch

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index e71fab6..7de1883 100644 (file)
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -9,8 +9,10 @@
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
---- /dev/null
-+++ b/scripts/boot/9990-grml-networking.sh
+Index: live-boot-grml/components/9990-grml-networking.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ live-boot-grml/components/9990-grml-networking.sh  2014-03-08 13:26:53.959682953 +0100
 @@ -0,0 +1,93 @@
 +#!/bin/sh
 +
@@ -19,7 +21,7 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +Grml_Networking () {
 +
 +if [ -n "${NONETWORKING}" ]; then
-+   exit 0
++   return 0
 +fi
 +
 +modprobe af_packet # req'd for DHCP
@@ -105,11 +107,11 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +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 ()
+Index: live-boot-grml/components/9990-main.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-main.sh        2014-03-08 13:26:53.963682483 +0100
++++ live-boot-grml/components/9990-main.sh     2014-03-08 13:26:53.959682953 +0100
+@@ -195,6 +195,8 @@
  
        Swap