X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=f68800dfe68f7350e71e8054d5224968b3c4bb89;hb=1190be85490f7ae893652f0c9dd7004c48b657ae;hp=d87bfe7c68d1e597eb98550d723da173c5921281;hpb=2fb509c1dabc8ea43e1e958a7ce4168d4c44047d;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index d87bfe7..f68800d 100755
--- 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
@@ -161,7 +175,8 @@ copy_exec /usr/bin/md5sum /bin
 if [ -x /usr/bin/memdiskfind ]
 then
 	copy_exec /usr/bin/memdiskfind
-	manual_add_modules phram mtdblock
+	manual_add_modules phram
+	manual_add_modules mtdblock
 fi
 
 # Program: cpio
@@ -176,12 +191,7 @@ copy_exec /bin/cpio /bin
 # Program: udev
 if [ -x /sbin/udevadm ]
 then
-	# lenny
 	copy_exec /sbin/udevadm /sbin
-else
-	# etch
-	copy_exec /sbin/udevtrigger /sbin
-	copy_exec /sbin/udevsettle /sbin
 fi
 if [ -x /usr/bin/udevinfo ]
 then
@@ -226,3 +236,21 @@ then
     manual_add_modules iscsi_tcp
     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
+
+	# Configuration file - may be needed if /etc/hosts is used.
+	#mkdir -p $DESTDIR/etc
+	#cp -p /etc/nsswitch.conf $DESTDIR/etc
+fi
+
+if [ "${LIVE_UNIONMOUNT}" = "true" ]
+then
+	# UnionMount
+	# only mount from patched util-linux can do this currently
+	copy_exec /bin/mount /bin/mount_full
+fi