projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a80a92
)
refresh 26_support_dns_bootoption.patch
author
Evgeni Golov
<evgeni@grml.org>
Thu, 15 Aug 2013 06:02:15 +0000
(08:02 +0200)
committer
Evgeni Golov
<evgeni@grml.org>
Thu, 15 Aug 2013 06:02:15 +0000
(08:02 +0200)
debian/patches/26_support_dns_bootoption.patch
patch
|
blob
|
history
diff --git
a/debian/patches/26_support_dns_bootoption.patch
b/debian/patches/26_support_dns_bootoption.patch
index
583e9b9
..
aad51f1
100644
(file)
--- 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
===================================================================
@DPATCH@
Index: live-boot-grml/scripts/boot/9990-networking.sh
===================================================================
---- live-boot-grml.orig/scripts/boot/9990-networking.sh 201
2-11-28 17:23:14.954502427 +01
00
-+++ live-boot-grml/scripts/boot/9990-networking.sh 201
2-11-28 17:46:56.190917365 +01
00
-@@ -15
3,7 +153
,7 @@
+--- live-boot-grml.orig/scripts/boot/9990-networking.sh 201
3-08-15 08:01:43.007980354 +02
00
++++ live-boot-grml/scripts/boot/9990-networking.sh 201
3-08-15 08:01:43.007980354 +02
00
+@@ -15
2,7 +152
,7 @@
echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
fi
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
===================================================================
then
Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
===================================================================
---- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh 201
2-11-28 17:46:38.000000000 +01
00
-+++ live-boot-grml/scripts/boot/9990-grml-networking.sh 201
2-11-28 17:46:56.190917365 +01
00
+--- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh 201
3-08-15 08:01:43.007980354 +02
00
++++ live-boot-grml/scripts/boot/9990-grml-networking.sh 201
3-08-15 08:01:43.007980354 +02
00
@@ -28,7 +28,12 @@
# prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
@@ -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
+
}
+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 @@
@@ -18,6 +18,19 @@
- BOOTIF="${
x
#BOOTIF=}"
+ BOOTIF="${
_PARAMETER
#BOOTIF=}"
;;
+ dns=*)
;;
+ dns=*)