Adding upstream version 4.0~a14.

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

diff --git a/backends/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
similarity index 89%
rename from backends/initramfs-tools/live.hook
rename to backend/initramfs-tools/live.hook
index 1814211..76f4218 100755 (executable)
--- a/backends/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -17,7 +17,7 @@ do
 done
 
 # 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 +27,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 +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"
@@ -58,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