X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=16a2d0cd4c99c17a097fa5c5e2636e818e856c36;hb=fa4e3b7531b58edc082487cba75f772121a21201;hp=645b168d917d79e06af3501fc4c9c4caf8a47e06;hpb=6fc8f78d026b31f4f4a3ee6507d726ddc37adbc8;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 645b168..16a2d0c 100755
--- a/hooks/live
+++ b/hooks/live
@@ -27,14 +27,6 @@ esac
 # Handling live-boot
 
 # Configuration
-if [ -r /etc/live.conf ]
-then
-	. /etc/live.conf
-
-	mkdir -p "${DESTDIR}"/etc
-	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
 
@@ -92,6 +84,9 @@ then
 	uuidgen -r > "${DESTDIR}"/conf/uuid.conf
 fi
 
+# Filesystem: btrfs
+manual_add_modules btrfs
+
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
@@ -159,6 +154,13 @@ fi
 # Program: md5sum
 copy_exec /usr/bin/md5sum /bin
 
+# Program: memdisk
+if [ -x /usr/bin/memdiskfind ]
+then
+	copy_exec /usr/bin/memdiskfind
+	manual_add_modules phram mtdblock
+fi
+
 # Program: cpio
 # busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots
 if [ -e "${DESTDIR}/bin/cpio" ]
@@ -212,3 +214,12 @@ if [ -x /usr/bin/curlftpfs ]
 then
 	copy_exec /usr/bin/curlftpfs /bin
 fi
+
+# iSCSI
+if [ -x /usr/sbin/iscsistart ]
+then
+    copy_exec /usr/sbin/iscsistart /bin
+    #manual_add_modules ib_iser
+    manual_add_modules iscsi_tcp
+    manual_add_modules crc32c
+fi