Merging casper 1.216.

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

diff --git a/hooks/live b/hooks/live
index 5e8bdc7..a018d95 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -35,17 +35,40 @@ then
        cp /etc/live.conf "${DESTDIR}"/etc
 fi
 
+mkdir -p "${DESTDIR}"/usr/share/live-initramfs
+cp /usr/share/live-initramfs/languagelist "${DESTDIR}"/usr/share/live-initramfs
+
 # 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
+copy_exec /usr/share/live-initramfs/live-set-selections /bin
 
 # Scripts
 cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
 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}" ]
+       then
+               cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
+       fi
+done
+
+# udev dependencies (squeeze and newer)
+for FILE in /lib/udev/*_id
+do
+       if [ ! -e "${DESTDIR}/${FILE}" ]
+       then
+               mkdir -p "${DESTDIR}/lib/udev"
+               copy_exec "${FILE}" /lib/udev
+       fi
+done
+
 # Handling other stuff
 
 # Configuration: keymap (usefull when using encryption)
@@ -57,6 +80,13 @@ then
        cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
 fi
 
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
+then
+       mkdir -p "${DESTDIR}"/conf
+       uuidgen -r > "${DESTDIR}"/conf/uuid.conf
+fi
+
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
@@ -64,17 +94,34 @@ then
         manual_add_modules cifs
 fi
 
-# Filesystem: ext3
+# Filesystem: ext3/ext4
 manual_add_modules ext3
+manual_add_modules ext4
+
+# Filesystem: jffs2
+manual_add_modules jffs2
+
+if [ -x /usr/bin/rsync ]
+then
+       copy_exec /usr/bin/rsync /bin
+fi
 
 # 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
+# Filesystem: aufs/unionfs
 manual_add_modules aufs
+manual_add_modules unionfs
+
+# Filesystem: unionfs-fuse
+if [ -x /usr/bin/unionfs-fuse ]
+then
+       copy_exec /usr/bin/unionfs-fuse /bin
+fi
 
 # Filesystem: vfat
 manual_add_modules nls_cp437
@@ -82,6 +129,9 @@ manual_add_modules nls_iso8859-1
 manual_add_modules nls_utf8
 manual_add_modules vfat
 
+# Filesystem: ntfs
+manual_add_modules ntfs
+
 # Hardware: cdrom
 manual_add_modules ide-cd
 manual_add_modules ide-generic
@@ -89,6 +139,9 @@ manual_add_modules ohci1394
 manual_add_modules sbp2
 manual_add_modules sr_mod
 
+# Hardware: usb
+manual_add_modules sd_mod
+
 # Hardware: network
 auto_add_modules net
 
@@ -101,16 +154,56 @@ fi
 # Program: md5sum
 copy_exec /usr/bin/md5sum /bin
 
+# Program: cpio
+# busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots
+if [ -e "${DESTDIR}/bin/cpio" ]
+then
+       # Override already present cpio's, mostly klibc's
+       rm "${DESTDIR}/bin/cpio"
+fi
+copy_exec /bin/cpio /bin
+
 # Program: udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+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
+       copy_exec /usr/bin/udevinfo /bin
+fi
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+       copy_exec /usr/bin/wget /bin
+fi
+
+# Program: blockdev
+if [ -x /sbin/blockdev ]
 then
-       mkdir -p "${DESTDIR}"/lib/udev
+       copy_exec /sbin/blockdev /sbin
+fi
+
+# FUSE kernel module
+manual_add_modules fuse
 
-       copy_exec /lib/udev/cdrom_id /lib/udev
-       copy_exec /lib/udev/path_id /lib/udev
-       copy_exec /lib/udev/vol_id /lib/udev
+# FUSE filesystem: httpfs2
+if [ -x /usr/bin/httpfs2_ssl ]
+then
+       copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
+elif [ -x /usr/bin/httpfs2 ]
+then
+       copy_exec /usr/bin/httpfs2 /bin/httpfs
 fi
 
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
+# FUSE filesystem: curlftpfs
+if [ -x /usr/bin/curlftpfs ]
+then
+       copy_exec /usr/bin/curlftpfs /bin
+fi