X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backend%2Finitramfs-tools%2Flive.hook;h=da0457c97eb0649bef11d531fd29eda7b2f91e4b;hb=bf57d165d02eef50d81c758d9995f5772cceff31;hp=1814211655a940269da25f76f6ed87a49a4b6bc2;hpb=9bb62c8a50e9e92b0e0d637c624d364be6a911ca;p=live-boot-grml.git

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 1814211..da0457c 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -16,8 +16,14 @@ do
 	fi
 done
 
+# Grml version information:
+if [ -r /etc/grml_version ]
+then
+       cp /etc/grml_version "${DESTDIR}"/etc
+fi
+
 # Checking live-boot
-if [ ! -e /lib/live/boot ]
+if [ ! -e /bin/live-boot ]
 then
 	echo
 	echo "W: live-boot-initramfs-tools (backend) installed without live-boot,"
@@ -27,15 +33,18 @@ fi
 
 [ "${QUIET}" ] || echo -n " core"
 
+mkdir -p "${DESTDIR}/bin"
+cp -a /bin/live-boot /lib/live/boot "${DESTDIR}/bin"
+
 mkdir -p "${DESTDIR}/lib/live"
-cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
+cp -a /lib/live/boot "${DESTDIR}/lib/live"
 
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-	if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1
+	if [ ! -e "${DESTDIR}/${FILE}" ] && ls "${FILE}" > /dev/null 2>&1
 	then
-		cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
+		cp -a "${FILE}" "${DESTDIR}/${FILE}"
 	fi
 done
 
@@ -47,8 +56,8 @@ 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
+	mkdir -p "${DESTDIR}/lib/udev/rules.d"
+	cp -p /lib/udev/rules.d/60-cdrom_id.rules "${DESTDIR}/lib/udev/rules.d"
 fi
 
 [ "${QUIET}" ] || echo -n " filesystems"
@@ -58,15 +67,15 @@ if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
 then
 	copy_exec /bin/loadkeys
 
-	mkdir -p "${DESTDIR}"/etc
-	cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+	mkdir -p "${DESTDIR}/etc"
+	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
+	mkdir -p "${DESTDIR}/conf"
+	uuidgen -r > "${DESTDIR}/conf/uuid.conf"
 fi
 
 # Filesystem: btrfs
@@ -102,16 +111,9 @@ manual_add_modules squashfs
 manual_add_modules sqlzma
 manual_add_modules unlzma
 
-# Filesystem: aufs/overlayfs/unionfs
+# Filesystem: aufs/overlay
 manual_add_modules aufs
-manual_add_modules overlayfs
-manual_add_modules unionfs
-
-# Filesystem: unionfs-fuse
-if [ -x /usr/bin/unionfs-fuse ]
-then
-	copy_exec /usr/bin/unionfs-fuse /bin
-fi
+manual_add_modules overlay
 
 # Filesystem: vfat
 manual_add_modules nls_cp437