X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=b3de1e592dbb15c449bdbb52cdd2850c45dc5981;hb=1ff6cc29bb8dfd8424707703af45c1bea8f6daaa;hp=d87bfe7c68d1e597eb98550d723da173c5921281;hpb=e3b729ecd9a6bd9dd056b4daa22d8e9afb04169f;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index d87bfe7..b3de1e5 100755
--- a/hooks/live
+++ b/hooks/live
@@ -22,10 +22,27 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
+[ "${QUIET}" ] || echo -n live-boot:
+
 # 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
 
+[ "${QUIET}" ] || echo -n " "core
 # Configuration
 if [ -e /usr/share/live-boot/languagelist ]
 then
@@ -47,7 +64,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
@@ -71,6 +88,7 @@ fi
 
 # Handling other stuff
 
+[ "${QUIET}" ] || echo -n " "filesystems
 # Configuration: keymap (usefull when using encryption)
 if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
 then
@@ -135,6 +153,7 @@ manual_add_modules vfat
 # Filesystem: ntfs
 manual_add_modules ntfs
 
+[ "${QUIET}" ] || echo -n " "devices
 # Hardware: cdrom
 manual_add_modules ide-cd
 manual_add_modules ide-generic
@@ -154,14 +173,17 @@ then
 	copy_exec /usr/bin/eject /bin
 fi
 
+[ "${QUIET}" ] || echo -n " "utils
 # Program: md5sum
 copy_exec /usr/bin/md5sum /bin
 
 # Program: memdisk
 if [ -x /usr/bin/memdiskfind ]
 then
+[ "${QUIET}" ] || echo -n :memdisk
 	copy_exec /usr/bin/memdiskfind
-	manual_add_modules phram mtdblock
+	manual_add_modules phram
+	manual_add_modules mtdblock
 fi
 
 # Program: cpio
@@ -176,27 +198,26 @@ copy_exec /bin/cpio /bin
 # Program: udev
 if [ -x /sbin/udevadm ]
 then
-	# lenny
+	[ "${QUIET}" ] || echo -n " "udev
 	copy_exec /sbin/udevadm /sbin
-else
-	# etch
-	copy_exec /sbin/udevtrigger /sbin
-	copy_exec /sbin/udevsettle /sbin
 fi
 if [ -x /usr/bin/udevinfo ]
 then
+	[ "${QUIET}" ] || echo -n " "udev
 	copy_exec /usr/bin/udevinfo /bin
 fi
 
 # Program: wget
 if [ -x /usr/bin/wget ]
 then
+	[ "${QUIET}" ] || echo -n " "wget
 	copy_exec /usr/bin/wget /bin
 fi
 
 # Program: blockdev
 if [ -x /sbin/blockdev ]
 then
+	[ "${QUIET}" ] || echo -n " "blockdev
 	copy_exec /sbin/blockdev /sbin
 fi
 
@@ -206,23 +227,55 @@ manual_add_modules fuse
 # FUSE filesystem: httpfs2
 if [ -x /usr/bin/httpfs2_ssl ]
 then
+	[ "${QUIET}" ] || echo -n " "httpfs:ssl
 	copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
 elif [ -x /usr/bin/httpfs2 ]
 then
+	[ "${QUIET}" ] || echo -n " "httpfs
 	copy_exec /usr/bin/httpfs2 /bin/httpfs
 fi
 
 # FUSE filesystem: curlftpfs
 if [ -x /usr/bin/curlftpfs ]
 then
+	[ "${QUIET}" ] || echo -n " "ftpfs
 	copy_exec /usr/bin/curlftpfs /bin
 fi
 
 # iSCSI
 if [ -x /usr/sbin/iscsistart ]
 then
-    copy_exec /usr/sbin/iscsistart /bin
-    #manual_add_modules ib_iser
-    manual_add_modules iscsi_tcp
-    manual_add_modules crc32c
+	[ "${QUIET}" ] || echo -n " "iscsi
+	copy_exec /usr/sbin/iscsistart /bin
+	#manual_add_modules ib_iser
+	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
+# 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."
+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
+	[ "${QUIET}" ] || echo -n " "unionmount
+	# UnionMount
+	# only mount from patched util-linux can do this currently
+	copy_exec /bin/mount /bin/mount_full
+fi
+
+[ "${QUIET}" ] || echo .