X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=b023d4bc0ccc77f230fbc4f202fb08e363b61641;hb=11575c6aee0916c918b1e4e98731566d20586df9;hp=b3de1e592dbb15c449bdbb52cdd2850c45dc5981;hpb=6666658535b255cb71d48ddeb415aeb3023e1251;p=live-boot-grml.git diff --git a/hooks/live b/hooks/live index b3de1e5..b023d4b 100755 --- a/hooks/live +++ b/hooks/live @@ -42,6 +42,13 @@ fi # Handling live-boot +if [ ! -e /usr/share/live-boot ] +then + echo "W: live-boot-initramfs-tools (backend) installed without live-boot," + echo "W: this initramfs will *NOT* have live support." + exit 0 +fi + [ "${QUIET}" ] || echo -n " "core # Configuration if [ -e /usr/share/live-boot/languagelist ] @@ -134,8 +141,9 @@ manual_add_modules squashfs manual_add_modules sqlzma manual_add_modules unlzma -# Filesystem: aufs/unionfs +# Filesystem: aufs/overlayfs/unionfs manual_add_modules aufs +manual_add_modules overlayfs manual_add_modules unionfs # Filesystem: unionfs-fuse @@ -252,23 +260,17 @@ then manual_add_modules crc32c fi -# DNS for initramfs -#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd -# DNS server: -if ls /lib/libnss_dns.so.* >/dev/null 2>&1 ; then # non-multiarch libc - copy_exec /lib/libnss_dns.so.* /lib -elif ls /lib/*/libnss_dns.so.* >/dev/null 2>&1 ; then # multiarch libc - for libnss in /lib/*/libnss_dns.so.* ; do - copy_exec "$libnss" - done -else - echo "Warning: libnss_dns.so.* not found. DNS in initramfs not functional." +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 + + # Configuration file - may be needed if /etc/hosts is used. + #mkdir -p $DESTDIR/etc + #cp -p /etc/nsswitch.conf $DESTDIR/etc fi -#copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd - -# Configuration file - may be needed if /etc/hosts is used. -#mkdir -p $DESTDIR/etc -#cp -p /etc/nsswitch.conf $DESTDIR/etc if [ "${LIVE_UNIONMOUNT}" = "true" ] then