X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=697efbfc86a7204f96e56181e188bc49731215a7;hb=c0b7db3116c699c78c11ff47d240ee126f9dab5f;hp=9aeca4bd4945ef331ea8ebd0da2e2b42688e0af8;hpb=883234b7943f93dc33ee5f237c9183973a5090f4;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 9aeca4b..697efbf 100755
--- a/hooks/live
+++ b/hooks/live
@@ -35,6 +35,9 @@ 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
 
@@ -80,8 +83,9 @@ 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
@@ -103,6 +107,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
@@ -125,10 +132,29 @@ 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/udevadm /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 ]