X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F26_support_dns_bootoption.patch;h=3df83d70fc0ed3c535037f84ee39a078943af363;hb=a06109b61c125129e45b0fde2bf7b1d61865735b;hp=f79d9622fb18227c5386f3e97d270d273c8f63db;hpb=8424e93b27a3c5ae551ff1a5c456d0de96fc67c8;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
old mode 100755
new mode 100644
index f79d962..3df83d7
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,11 +5,12 @@
 ## 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: b/scripts/live
+===================================================================
+--- a/scripts/live	2011-07-24 22:08:11.000000000 +0200
++++ b/scripts/live	2011-07-24 22:08:13.000000000 +0200
+@@ -77,6 +77,18 @@
+ 				BOOTIF="${x#BOOTIF=}"
  				;;
  
 +			dns=*)
@@ -27,9 +28,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  			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
+Index: b/scripts/live-bottom/23networking_grml
+===================================================================
+--- a/scripts/live-bottom/23networking_grml	2011-07-24 22:08:07.000000000 +0200
++++ b/scripts/live-bottom/23networking_grml	2011-07-24 22:08:13.000000000 +0200
 @@ -44,7 +44,12 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)