1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 26_support_dns_bootoption.dpatch by Michael Prokop <mika@grml.org>
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
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
13 echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
16 - for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
17 + for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
19 if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
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
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
34 + RESOLVCONF="/root/etc/resolv.conf"
37 # config for loopback networking
44 +if [ -n "$DNSSERVER1" ]
46 + # disable any existing entries
47 + if [ -r $RESOLVCONF ]
49 + sed -i 's/nameserver/# nameserver/' $RESOLVCONF
51 + for i in $DNSSERVER1 $DNSSERVER2
53 + echo "nameserver $i" >> $RESOLVCONF
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
65 + DNSSERVER="${_PARAMETER#*=}"
66 + if echo "${DNSSERVER}" | grep -q , ; then
67 + DNSSERVER1="${DNSSERVER%,*}"
68 + DNSSERVER2="${DNSSERVER#*,}"
69 + export DNSSERVER1 DNSSERVER2
71 + DNSSERVER1="$DNSSERVER"
78 BOOTID="${_PARAMETER#bootid=}"