debian/patches/26_support_dns_bootoption.patch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 26_support_dns_bootoption.dpatch by Michael Prokop <mika@grml.org>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
   6
   7 @DPATCH@
   8 Index: live-boot-grml/scripts/boot/9990-networking.sh
   9 ===================================================================
  10 --- live-boot-grml.orig/scripts/boot/9990-networking.sh 2012-11-28 17:23:14.954502427 +0100
  11 +++ live-boot-grml/scripts/boot/9990-networking.sh      2012-11-28 17:46:56.190917365 +0100
  12 @@ -153,7 +153,7 @@
  13                                 echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
  14                         fi
  15
  16 -                       for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
  17 +                       for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
  18                         do
  19                                 if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
  20                                 then
  21 Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
  22 ===================================================================
  23 --- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh    2012-11-28 17:46:38.000000000 +0100
  24 +++ live-boot-grml/scripts/boot/9990-grml-networking.sh 2012-11-28 17:46:56.190917365 +0100
  25 @@ -28,7 +28,12 @@
  26
  27  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
  28  IFFILE="/root/etc/network/interfaces"
  29 -RESOLVCONF="/root/etc/resolv.conf"
  30 +if [ -L /root/etc/resolv.conf ] ; then
  31 +  # assume we have resolvconf
  32 +  RESOLVCONF=/root/etc/resolvconf/resolv.conf.d/base
  33 +else
  34 +  RESOLVCONF="/root/etc/resolv.conf"
  35 +fi
  36
  37  # config for loopback networking
  38  cat > $IFFILE << EOF
  39 @@ -90,4 +95,18 @@
  40      echo>> $IFFILE
  41  done
  42
  43 +# dns bootoption
  44 +if [ -n "$DNSSERVER1" ]
  45 +then
  46 +       # disable any existing entries
  47 +       if [ -r $RESOLVCONF ]
  48 +       then
  49 +               sed -i 's/nameserver/# nameserver/' $RESOLVCONF
  50 +       fi
  51 +       for i in $DNSSERVER1 $DNSSERVER2
  52 +       do
  53 +               echo "nameserver $i" >> $RESOLVCONF
  54 +       done
  55 +fi
  56 +
  57  }
  58 --- live-boot-grml.orig/scripts/boot/9990-cmdline-old   2012-11-28 17:46:38.000000000 +0100
  59 +++ live-boot-grml/scripts/boot/9990-cmdline-old        2012-11-28 17:46:56.190917365 +0100
  60 @@ -18,6 +18,19 @@
  61                                 BOOTIF="${x#BOOTIF=}"
  62                                 ;;
  63
  64 +                       dns=*)
  65 +                               DNSSERVER="${_PARAMETER#*=}"
  66 +                               if echo "${DNSSERVER}" | grep -q , ; then
  67 +                                       DNSSERVER1="${DNSSERVER%,*}"
  68 +                                       DNSSERVER2="${DNSSERVER#*,}"
  69 +                                       export DNSSERVER1 DNSSERVER2
  70 +                               else
  71 +                                       DNSSERVER1="$DNSSERVER"
  72 +                                       export DNSSERVER1
  73 +                               fi
  74 +                               unset DNSSERVER
  75 +                               ;;
  76 +
  77                         bootid=*)
  78                                 BOOTID="${_PARAMETER#bootid=}"
  79                                 export BOOTID