refresh 26_support_dns_bootoption.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
old mode 100755 (executable)
new mode 100644 (file)
index f79d962..aad51f1
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,32 +5,24 @@
 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live live-boot-grml/scripts/live
---- live-boot-grml~/scripts/live       2011-05-03 17:03:57.483541293 +0200
-+++ live-boot-grml/scripts/live        2011-05-03 17:03:57.576874626 +0200
-@@ -73,6 +73,18 @@
-                               export DEFCONSOLE
-                               ;;
+Index: live-boot-grml/scripts/boot/9990-networking.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-networking.sh        2013-08-15 08:01:43.007980354 +0200
++++ live-boot-grml/scripts/boot/9990-networking.sh     2013-08-15 08:01:43.007980354 +0200
+@@ -152,7 +152,7 @@
+                               echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
+                       fi
  
-+                      dns=*)
-+                              DNSSERVER="${ARGUMENT#*=}"
-+                              if echo "${DNSSERVER}" | grep -q , ; then
-+                                      DNSSERVER1="${DNSSERVER%,*}"
-+                                      DNSSERVER2="${DNSSERVER#*,}"
-+                                      export DNSSERVER1 DNSSERVER2
-+                              else
-+                                      DNSSERVER1="$DNSSERVER"
-+                                      export DNSSERVER1
-+                              fi
-+                              unset DNSSERVER
-+                              ;;
-                       debug)
-                               DEBUG="Yes"
-                               export DEBUG
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live-bottom/23networking_grml live-boot-grml/scripts/live-bottom/23networking_grml
---- live-boot-grml~/scripts/live-bottom/23networking_grml      2011-05-03 17:03:57.426874629 +0200
-+++ live-boot-grml/scripts/live-bottom/23networking_grml       2011-05-03 17:05:11.820206602 +0200
-@@ -44,7 +44,12 @@
+-                      for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
++                      for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
+                       do
+                               if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+                               then
+Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh   2013-08-15 08:01:43.007980354 +0200
++++ live-boot-grml/scripts/boot/9990-grml-networking.sh        2013-08-15 08:01:43.007980354 +0200
+@@ -28,7 +28,12 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
  IFFILE="/root/etc/network/interfaces"
@@ -44,11 +36,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  # config for loopback networking
  cat > $IFFILE << EOF
-@@ -105,3 +110,17 @@
- 
+@@ -90,4 +95,18 @@
      echo>> $IFFILE
  done
-+
+ 
 +# dns bootoption
 +if [ -n "$DNSSERVER1" ]
 +then
@@ -62,3 +53,29 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
 +              echo "nameserver $i" >> $RESOLVCONF
 +      done
 +fi
++
+ }
+Index: live-boot-grml/scripts/boot/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-cmdline-old  2013-08-15 08:01:43.007980354 +0200
++++ live-boot-grml/scripts/boot/9990-cmdline-old       2013-08-15 08:01:43.007980354 +0200
+@@ -18,6 +18,19 @@
+                               BOOTIF="${_PARAMETER#BOOTIF=}"
+                               ;;
+ 
++                      dns=*)
++                              DNSSERVER="${_PARAMETER#*=}"
++                              if echo "${DNSSERVER}" | grep -q , ; then
++                                      DNSSERVER1="${DNSSERVER%,*}"
++                                      DNSSERVER2="${DNSSERVER#*,}"
++                                      export DNSSERVER1 DNSSERVER2
++                              else
++                                      DNSSERVER1="$DNSSERVER"
++                                      export DNSSERVER1
++                              fi
++                              unset DNSSERVER
++                              ;;
++
+                       bootid=*)
+                               BOOTID="${_PARAMETER#bootid=}"
+                               export BOOTID