consolidate network related patches into 15_networking_grml.patch

[live-boot-grml.git] / debian / patches / 26_support_dns_bootoption.patch

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index 583e9b9..0da7f73 100644 (file)
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,11 +5,11 @@
 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
 
 @DPATCH@
-Index: live-boot-grml/scripts/boot/9990-networking.sh
+Index: live-boot-grml/components/9990-networking.sh
 ===================================================================
---- live-boot-grml.orig/scripts/boot/9990-networking.sh        2012-11-28 17:23:14.954502427 +0100
-+++ live-boot-grml/scripts/boot/9990-networking.sh     2012-11-28 17:46:56.190917365 +0100
-@@ -153,7 +153,7 @@
+--- live-boot-grml.orig/components/9990-networking.sh  2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-networking.sh       2014-03-08 13:33:11.611386038 +0100
+@@ -151,7 +151,7 @@
                                echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
                        fi
  
@@ -18,47 +18,12 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
                        do
                                if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
                                then
-Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
+Index: live-boot-grml/components/9990-cmdline-old
 ===================================================================
---- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh   2012-11-28 17:46:38.000000000 +0100
-+++ live-boot-grml/scripts/boot/9990-grml-networking.sh        2012-11-28 17:46:56.190917365 +0100
-@@ -28,7 +28,12 @@
- 
- # 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
-@@ -90,4 +95,18 @@
-     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
-+
- }
---- live-boot-grml.orig/scripts/boot/9990-cmdline-old  2012-11-28 17:46:38.000000000 +0100
-+++ live-boot-grml/scripts/boot/9990-cmdline-old       2012-11-28 17:46:56.190917365 +0100
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:33:11.611386038 +0100
 @@ -18,6 +18,19 @@
-                               BOOTIF="${x#BOOTIF=}"
+                               BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;
  
 +                      dns=*)