X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=hooks%2Flive;h=e653aef5a3c7c374e0fa6ee3ee1dfe48dde519a9;hb=3d4b86718ca4cdae8c6ead03035abd561a5d5728;hp=94383ca9a50b6f19d168096afeebe4e17f2d8efe;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 94383ca..e653aef 100755
--- a/hooks/live
+++ b/hooks/live
@@ -1,75 +1,137 @@
-#!/bin/sh -e
-# initramfs hook for casper
+#!/bin/sh
 
-PREREQS=""
+# initramfs hook for live-initramfs (Debian Live)
+
+set -e
+
+# initramfs-tools header
+
+PREREQ=""
 
-# Output pre-requisites
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case "$1" in
-    prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-manual_add_modules unionfs
+# live-initramfs hook
 
-# We need losetup
-copy_exec /sbin/losetup /sbin
+# Handling live-initramfs
+
+# Configuration
+if [ -r /etc/live.conf ]
+then
+	. /etc/live.conf
 
-# Casper hooks
-mkdir -p ${DESTDIR}/lib/live-initramfs
+	mkdir -p "${DESTDIR}"/etc
+	cp /etc/live.conf "${DESTDIR}"/etc
+fi
+
+# Directories
+mkdir -p "${DESTDIR}"/lib/live-initramfs
+
+# Executables
 copy_exec /usr/share/live-initramfs/live-reconfigure /bin
 copy_exec /usr/share/live-initramfs/live-preseed /bin
 
-mkdir -p ${DESTDIR}/lib/udev
-copy_exec /lib/udev/cdrom_id /lib/udev
-copy_exec /lib/udev/vol_id /lib/udev
-copy_exec /lib/udev/path_id /lib/udev
-copy_exec /usr/bin/udevinfo /bin
-copy_exec /usr/bin/eject /bin
-
-# cifs boot
-if [ -x /sbin/mount.cifs ]; then
-    copy_exec /sbin/mount.cifs /sbin
-    for x in cifs; do
-        manual_add_modules ${x}
-    done
+# Scripts
+cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
+cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
+
+# klibc dependencies
+for hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
+do
+	if ls /lib/${hidden_klibc_dep_library}.so.* > /dev/null 2>&1
+	then
+		cp -a /lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+	fi
+done
+
+# Handling other stuff
+
+# Configuration: keymap (usefull when using encryption)
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
+then
+	copy_exec /bin/loadkeys /bin
+
+	mkdir -p "${DESTDIR}"/etc
+	cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
 fi
 
-# squashfs
-manual_add_modules squashfs
-manual_add_modules loop
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
+then
+	mkdir -p "${DESTDIR}"/conf
+	uuidgen -r > "${DESTDIR}"/conf/uuid.conf
+fi
 
-# random file system modules
-manual_add_modules vfat
+# Filesystem: cifs
+if [ -x /sbin/mount.cifs ]
+then
+	copy_exec /sbin/mount.cifs /sbin
+        manual_add_modules cifs
+fi
+
+# Filesystem: ext3
 manual_add_modules ext3
-# needed for vfat. :-/
+
+# Filesystem: jffs2
+manual_add_modules jffs2
+
+# Filesystem: squashfs
+copy_exec /sbin/losetup /sbin
+manual_add_modules loop
+manual_add_modules squashfs
+manual_add_modules sqlzma
+manual_add_modules unlzma
+
+# Filesystem: unionfs/aufs
+manual_add_modules unionfs
+manual_add_modules aufs
+
+# Filesystem: vfat
 manual_add_modules nls_cp437
-manual_add_modules nls_utf8
 manual_add_modules nls_iso8859-1
+manual_add_modules nls_utf8
+manual_add_modules vfat
 
-# cdrom modules
-manual_add_modules sr_mod
+# Hardware: cdrom
 manual_add_modules ide-cd
-manual_add_modules sbp2
+manual_add_modules ide-generic
 manual_add_modules ohci1394
+manual_add_modules sbp2
+manual_add_modules sr_mod
 
-# integrity check
-copy_exec /usr/lib/live-initramfs/live-md5check /bin
-
-cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts
-cp /usr/share/initramfs-tools/scripts/live-helpers $DESTDIR/scripts
+# Hardware: usb
+manual_add_modules sd_mod
 
+# Hardware: network
 auto_add_modules net
 
-if [ -e /etc/live.conf ]; then
-    mkdir -p ${DESTDIR}/etc
-    cp /etc/live.conf ${DESTDIR}/etc
+# Program: eject
+if [ -x /usr/bin/eject ]
+then
+	copy_exec /usr/bin/eject /bin
+fi
+
+# Program: md5sum
+copy_exec /usr/bin/md5sum /bin
+
+# Program: udev
+copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevsettle /sbin
+copy_exec /usr/bin/udevinfo /bin
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+	copy_exec /usr/bin/wget /bin
 fi