From eae42969c6f684a71e2aa812eaa449f3e64a33fc Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 15 Aug 2013 08:02:15 +0200 Subject: [PATCH] refresh 26_support_dns_bootoption.patch --- debian/patches/26_support_dns_bootoption.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch index 583e9b9..aad51f1 100644 --- a/debian/patches/26_support_dns_bootoption.patch +++ b/debian/patches/26_support_dns_bootoption.patch @@ -7,9 +7,9 @@ @DPATCH@ Index: live-boot-grml/scripts/boot/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/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 @@ -20,8 +20,8 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh then Index: live-boot-grml/scripts/boot/9990-grml-networking.sh =================================================================== ---- 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 +--- 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) @@ -55,10 +55,12 @@ Index: live-boot-grml/scripts/boot/9990-grml-networking.sh +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 +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="${x#BOOTIF=}" + BOOTIF="${_PARAMETER#BOOTIF=}" ;; + dns=*) -- 2.1.4