From 61895ec815db2d6dc078873149f7bc8118f9d055 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 20 Sep 2013 16:32:55 +0200 Subject: [PATCH] Do not "exit" if boot option nonetworking is set but "return" instead MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Nowadays we're running under one main script which sources all the further scripts. If we 'exit' in a script then we'd just exit the main init sequence, resulting in a kernel trace because the real™ init hasn't been found/executed. Thanks to Florian Ermisch for the initial bug report --- debian/patches/15_networking_grml.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch index e71fab6..f8aef45 100644 --- a/debian/patches/15_networking_grml.patch +++ b/debian/patches/15_networking_grml.patch @@ -19,7 +19,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 +105,9 @@ 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 () +@@ -197,6 +197,8 @@ Swap -- 2.1.4