X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=645b168d917d79e06af3501fc4c9c4caf8a47e06;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=3552f3a950121601385ed954304318381a5d7770;hpb=570998533ee43582fd73beee3e206c52ee3494dc;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 3552f3a..645b168 100755
--- a/hooks/live
+++ b/hooks/live
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# initramfs hook for live-initramfs (Debian Live)
+# initramfs hook for live-boot (Debian Live)
 
 set -e
 
@@ -22,9 +22,9 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-# live-initramfs hook
+# live-boot hook
 
-# Handling live-initramfs
+# Handling live-boot
 
 # Configuration
 if [ -r /etc/live.conf ]
@@ -35,23 +35,45 @@ then
 	cp /etc/live.conf "${DESTDIR}"/etc
 fi
 
+mkdir -p "${DESTDIR}"/usr/share/live-boot
+cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
+
 # Directories
-mkdir -p "${DESTDIR}"/lib/live-initramfs
+mkdir -p "${DESTDIR}"/lib/live-boot
 
 # Executables
-copy_exec /usr/share/live-initramfs/live-reconfigure /bin
-copy_exec /usr/share/live-initramfs/live-preseed /bin
+copy_exec /usr/share/live-boot/live-reconfigure /bin
+copy_exec /usr/share/live-boot/live-preseed /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 hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
+for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-	cp -a /lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+	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
+
+if [ -e /lib/udev/rules.d/60-cdrom_id.rules ]
+then
+	mkdir -p ${DESTDIR}/lib/udev/rules.d
+	cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d
+fi
+
 # Handling other stuff
 
 # Configuration: keymap (usefull when using encryption)
@@ -77,12 +99,18 @@ 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
@@ -90,9 +118,15 @@ 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
@@ -100,6 +134,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
@@ -122,13 +159,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
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
+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
+	copy_exec /sbin/blockdev /sbin
+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