X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=32adfb6602c20316603daf7e9f02305447d097b2;hb=4fc648acc4e010fe0c3046baeb26ec1334c16e27;hp=402f7ca1b2713fb98a1127961746e7d7572960e6;hpb=ea5ccacffb14572b4800d14fc9eea23cad7ca893;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 402f7ca..32adfb6 100755
--- a/hooks/live
+++ b/hooks/live
@@ -39,7 +39,6 @@ fi
 mkdir -p "${DESTDIR}"/lib/live-initramfs
 
 # Executables
-copy_exec /usr/lib/live-initramfs/live-md5check /bin
 copy_exec /usr/share/live-initramfs/live-reconfigure /bin
 copy_exec /usr/share/live-initramfs/live-preseed /bin
 
@@ -47,50 +46,56 @@ copy_exec /usr/share/live-initramfs/live-preseed /bin
 cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 
-# Handling binaries
+# 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
 
-# losetup
-copy_exec /sbin/losetup /sbin
+# Handling other stuff
 
-# mount.cifs
-if [ -x /sbin/mount.cifs ]
+# Configuration: keymap (usefull when using encryption)
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
 then
-	copy_exec /sbin/mount.cifs /sbin
-fi
+	copy_exec /bin/loadkeys /bin
 
-# eject
-copy_exec /usr/bin/eject /bin
+	mkdir -p "${DESTDIR}"/etc
+	cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+fi
 
-# udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
 then
-	mkdir -p "${DESTDIR}"/lib/udev
-
-	copy_exec /lib/udev/cdrom_id /lib/udev
-	copy_exec /lib/udev/path_id /lib/udev
-	copy_exec /lib/udev/vol_id /lib/udev
+	mkdir -p "${DESTDIR}"/conf
+	uuidgen -r > "${DESTDIR}"/conf/uuid.conf
 fi
 
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
-
-# Handling kernel modules
-
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
+	copy_exec /sbin/mount.cifs /sbin
         manual_add_modules cifs
 fi
 
-# Filesystem: ext3
+# Filesystem: ext3/ext4
 manual_add_modules ext3
+manual_add_modules ext4
+
+# 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
+# Filesystem: aufs/unionfs
+manual_add_modules aufs
 manual_add_modules unionfs
 
 # Filesystem: vfat
@@ -99,20 +104,72 @@ 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
 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
 
-# Custom keymap (usefull when using encryption)
-if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
+# Program: eject
+if [ -x /usr/bin/eject ]
 then
-	copy_exec /bin/loadkeys /bin
+	copy_exec /usr/bin/eject /bin
+fi
 
-	mkdir -p "${DESTDIR}"/etc
-	cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+# 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 [ -x /sbin/udevadm ]
+then
+	# lenny
+	copy_exec /sbin/udevadm /sbin
+else
+	# etch
+	copy_exec /sbin/udevtrigger /sbin
+	copy_exec /sbin/udevsettle /sbin
+fi
+copy_exec /usr/bin/udevinfo /bin
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+	copy_exec /usr/bin/wget /bin
+fi
+
+# FUSE kernel module
+manual_add_modules fuse
+
+# 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
+
+# FUSE filesystem: curlftpfs
+if [ -x /usr/bin/curlftpfs ]
+then
+	copy_exec /usr/bin/curlftpfs /bin
 fi