From: Michael Prokop <mika@grml.org>
Date: Thu, 13 Dec 2018 16:26:36 +0000 (+0100)
Subject: Support debian_networking boot option to use Debian's network behavior
X-Git-Tag: debian/1%20180603+grml.1~2
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=27bc786ffea0c796827b628fb48fcdd755eace9d

Support debian_networking boot option to use Debian's network behavior

Debian's ip=... support diverges from kernel one and we (Grml) prefer
to use the behavior that's used by the kernel. By default we use our
Grml_Networking implementation from components/9990-grml-networking.sh,
but if the debian_networking boot option is used then we use Debian's
live-boot behavior with Netbase from components/9990-netbase.sh.
(Some minor details also diverge in the network handling, with
vlan support present in Grml, different nameserver handling,...)
---

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 0202130..b9bd71b 100755
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -182,11 +182,14 @@ Live ()
 	mount --rbind /run/live ${rootmnt}/lib/live/mount
 
 	Fstab
-	Netbase
 
 	Swap
 
-	Grml_Networking
+	if grep -q debian_networking /proc/cmdline ; then
+		Netbase
+	else
+		Grml_Networking
+	fi
 
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-