Release new version 2.0.12-1+grml.06.

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

diff --git a/hooks/live b/hooks/live
index d87bfe7..80992e3 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -24,6 +24,20 @@ esac
 
 # live-boot hook
 
+# Reading configuration file from filesystem
+if [ -e /etc/live/boot.conf ]
+then
+       . /etc/live/boot.conf
+fi
+
+if ls /etc/live/boot.d/* > /dev/null 2>&1
+then
+       for _FILE in /etc/live/boot.d/*
+       do
+               . ${_FILE}
+       done
+fi
+
 # Handling live-boot
 
 # Configuration
@@ -47,7 +61,7 @@ cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-       if [ ! -e "${DESTDIR}"/"${FILE}" ]
+       if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1
        then
                cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
        fi
@@ -226,3 +240,19 @@ then
     manual_add_modules iscsi_tcp
     manual_add_modules crc32c
 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
+
+# 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