X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F29_support_dns_in_initramfs.patch;h=501c607a85affda7e5b27b1b400d650ea326476a;hb=3b3ac7b387df59cc871f6572344f249a203b371c;hp=5f073e5c6944d83faff6fe6dd7084e13827c553a;hpb=52dcca5493c1a58029f247cf196759795274d806;p=live-boot-grml.git diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch index 5f073e5..501c607 100644 --- a/debian/patches/29_support_dns_in_initramfs.patch +++ b/debian/patches/29_support_dns_in_initramfs.patch @@ -6,33 +6,45 @@ Date: Fri Mar 25 23:02:38 2011 +0100 Thanks to Ulrich Dangel for discovering this. [Closes: issue848] -diff --git a/hooks/live b/hooks/live -index 309c26f..3862a60 100755 ---- a/hooks/live -+++ b/hooks/live -@@ -252,17 +252,14 @@ then - manual_add_modules crc32c - fi +Index: live-boot-grml/backend/initramfs-tools/live.hook +=================================================================== +--- live-boot-grml.orig/backend/initramfs-tools/live.hook 2014-03-08 13:36:37.835196873 +0100 ++++ live-boot-grml/backend/initramfs-tools/live.hook 2014-03-08 13:36:37.835196873 +0100 +@@ -228,23 +228,19 @@ --if [ "${LIVE_DNS}" = "true" ] --then -- [ "${QUIET}" ] || echo -n " "dns -- #copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd -- copy_exec /lib/libnss_dns.so.* /lib # DNS server -- #copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd + # Some experimental stuff + +-case "${LIVE_DNS}" in +- true) +- [ "${QUIET}" ] || echo -n " dns" +- +- # /lib/libnss_dns.so.*:a DNS +- # /lib/libnss_files.so.*: /etc/hosts and /etc/passwd +- # /lib/libnss_compat.so.*: /etc/passwd +- +- for _SHLIB in $(find /lib -name 'libnss_dns.so.*') +- do +- copy_exec "${_SHLIB}" +- done - -- # Configuration file - may be needed if /etc/hosts is used. -- #mkdir -p $DESTDIR/etc -- #cp -p /etc/nsswitch.conf $DESTDIR/etc --fi -+# DNS for initramfs -+#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd -+copy_exec /lib/libnss_dns.so.* /lib # DNS server -+#copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd +- # might be needed if /etc/hosts is used +- #mkdir -p "${DESTDIR}/etc" +- #cp -p /etc/nsswitch.conf "${DESTDIR}/etc" +- ;; +-esac ++[ "${QUIET}" ] || echo -n " dns" ++ ++# /lib/libnss_dns.so.*:a DNS ++# /lib/libnss_files.so.*: /etc/hosts and /etc/passwd ++# /lib/libnss_compat.so.*: /etc/passwd ++ ++for _SHLIB in $(find /lib -name 'libnss_dns.so.*') ++do ++ copy_exec "${_SHLIB}" ++done + -+# Configuration file - may be needed if /etc/hosts is used. -+#mkdir -p $DESTDIR/etc -+#cp -p /etc/nsswitch.conf $DESTDIR/etc ++# might be needed if /etc/hosts is used ++#mkdir -p "${DESTDIR}/etc" ++#cp -p /etc/nsswitch.conf "${DESTDIR}/etc" - if [ "${LIVE_UNIONMOUNT}" = "true" ] - then + [ "${QUIET}" ] || echo .