Dropping unionfs support, long superseeded with aufs.

[live-boot-grml.git] / backend / initramfs-tools / live.hook

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 560dd0f..fc3d6b4 100755 (executable)
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -29,15 +29,16 @@ fi
 
 mkdir -p "${DESTDIR}/bin"
 cp -a /bin/live-boot /lib/live/boot "${DESTDIR}/bin"
+
 mkdir -p "${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
 
@@ -49,8 +50,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"
@@ -60,15 +61,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
@@ -104,16 +105,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