update 15_networking_grml.patch against live-boot 5.0

[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..eefe681 100644 (file)
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -9,9 +9,11 @@
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
---- /dev/null
-+++ b/scripts/boot/9990-grml-networking.sh
-@@ -0,0 +1,93 @@
+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 16:34:29.800254396 +0100
+@@ -0,0 +1,120 @@
 +#!/bin/sh
 +
 +#set -e
@@ -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
@@ -42,7 +44,12 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +
 +# prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
 +IFFILE="/root/etc/network/interfaces"
-+RESOLVCONF="/root/etc/resolv.conf"
++if [ -L /root/etc/resolv.conf ] ; then
++  # assume we have resolvconf
++  RESOLVCONF=/root/etc/resolvconf/resolv.conf.d/base
++else
++  RESOLVCONF="/root/etc/resolv.conf"
++fi
 +
 +# config for loopback networking
 +cat > $IFFILE << EOF
@@ -68,6 +75,14 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +        method="manual"
 +    fi
 +
++    # if boot option "nodhcp" is set but also boot option "dhcp" is
++    # set, then dhcp should win over it as we default to dhcp and if
++    # nodhcp is used as default boot option but "dhcp" is added then it
++    # would be confusing to not get a working network setup
++    if [ "$DHCP" = "true" ] ; then
++        method="dhcp"
++    fi
++
 +    cat >> $IFFILE << EOF
 +allow-hotplug ${interface}
 +iface ${interface} inet ${method}
@@ -104,17 +119,56 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +    echo>> $IFFILE
 +done
 +
++# dns bootoption
++if [ -n "$DNSSERVER1" ]
++then
++      # disable any existing entries
++      if [ -r $RESOLVCONF ]
++      then
++              sed -i 's/nameserver/# nameserver/' $RESOLVCONF
++      fi
++      for i in $DNSSERVER1 $DNSSERVER2
++      do
++              echo "nameserver $i" >> $RESOLVCONF
++      done
++fi
++
 +}
-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 16:27:40.668243817 +0100
++++ live-boot-grml/components/9990-main.sh     2014-03-08 16:27:40.664244286 +0100
+@@ -195,6 +195,8 @@
  
        Swap
  
 +      Grml_Networking
 +
-       case "${UNIONFS}" in
-               unionfs-fuse)
-                       umount "${rootmnt}/dev"
+       exec 1>&6 6>&-
+       exec 2>&7 7>&-
+       kill ${tailpid}
+Index: live-boot-grml/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 16:27:34.117012248 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 16:33:20.536378749 +0100
+@@ -33,6 +33,8 @@
+                       nodhcp)
+                               DHCP=""
+                               export DHCP
++                              NODHCP="Yes"
++                              export NODHCP
+                               ;;
+ 
+                       ethdevice=*)
+@@ -150,6 +152,11 @@
+                               export NFS_COW
+                               ;;
+ 
++                      nodhcphostname)
++                              NODHCPHOSTNAME="Yes"
++                              export NODHCPHOSTNAME
++                              ;;
++
+                       nofstab)
+                               NOFSTAB="true"
+                               export NOFSTAB