Take into account the fact that udevadm is now in /bin and no longer in /sbin

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

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 8337a64..1ce922d 100755 (executable)
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -28,13 +28,20 @@ fi
 [ "${QUIET}" ] || echo -n " core"
 
 mkdir -p "${DESTDIR}/bin"
-cp -a /bin/live-boot /lib/live/boot "${DESTDIR}/bin"
+cp -a /bin/live-boot "${DESTDIR}/bin"
 
 mkdir -p "${DESTDIR}/lib/live"
 cp -a /lib/live/boot "${DESTDIR}/lib/live"
 
 mkdir -p "${DESTDIR}/etc/live"
-cp -a /etc/live/boot.conf /etc/live/boot "${DESTDIR}/etc/live"
+if [ -e /etc/live/boot.conf ]
+then
+       cp -a /etc/live/boot.conf "${DESTDIR}/etc/live"
+fi
+if [ -e /etc/live/boot ]
+then
+       cp -a /etc/live/boot "${DESTDIR}/etc/live"
+fi
 
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
@@ -116,6 +123,7 @@ manual_add_modules overlay
 manual_add_modules nls_cp437
 manual_add_modules nls_iso8859-1
 manual_add_modules nls_utf8
+manual_add_modules nls_ascii
 manual_add_modules vfat
 
 # Filesystem: ntfs
@@ -165,10 +173,10 @@ then
 fi
 
 # Program: udev
-if [ -x /sbin/udevadm ]
+if [ -x /bin/udevadm ]
 then
        [ "${QUIET}" ] || echo -n " udev"
-       copy_exec /sbin/udevadm
+       copy_exec /bin/udevadm
 fi
 
 # Program: wget