projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian'
[live-boot-grml.git]
/
debian
/
patches
/
30_support_multiarch_dns.patch
diff --git
a/debian/patches/30_support_multiarch_dns.patch
b/debian/patches/30_support_multiarch_dns.patch
index
c4cc8d8
..
90bd12b
100644
(file)
--- a/
debian/patches/30_support_multiarch_dns.patch
+++ b/
debian/patches/30_support_multiarch_dns.patch
@@
-12,11
+12,11
@@
Date: Tue Jun 7 10:15:52 2011 +0200
/lib/libnss_dns.so.* but could also be e.g.
/lib/x86_64-linux-gnu/libnss_dns.so.*.
/lib/libnss_dns.so.* but could also be e.g.
/lib/x86_64-linux-gnu/libnss_dns.so.*.
-
diff --git a/hooks/live
b/hooks/live
-index 3862a60..b3de1e5 100755
---- a/hooks/live
-+++ b/hooks/live
-@@ -2
54,7 +254,16 @@ fi
+
Index:
b/hooks/live
+===================================================================
+--- a/hooks/live
2011-07-24 22:08:17.000000000 +0200
++++ b/hooks/live
2011-07-24 22:08:18.000000000 +0200
+@@ -2
60,7 +260,16 @@
# DNS for initramfs
#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd
# DNS for initramfs
#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd