Release new version 2.0.12-1+grml.06.

[live-boot-grml.git] / hooks / live

diff --git a/hooks/live b/hooks/live
index e77c88b..80992e3 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -30,9 +30,9 @@ then
        . /etc/live/boot.conf
 fi
 
-if ls /etc/live/boot.conf.d/* > /dev/null 2>&1
+if ls /etc/live/boot.d/* > /dev/null 2>&1
 then
-       for _FILE in /etc/live/boot.conf.d/*
+       for _FILE in /etc/live/boot.d/*
        do
                . ${_FILE}
        done
@@ -241,13 +241,18 @@ then
     manual_add_modules crc32c
 fi
 
-if [ "${LIVE_DNS}" = "true" ]
-then
-       #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
+# 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
+
+# Configuration file - may be needed if /etc/hosts is used.
+#mkdir -p $DESTDIR/etc
+#cp -p /etc/nsswitch.conf $DESTDIR/etc
 
-       # 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
+       # UnionMount
+       # only mount from patched util-linux can do this currently
+       copy_exec /bin/mount /bin/mount_full
 fi