diff options
| -rwxr-xr-x | backend/initramfs-tools/live.hook | 17 | ||||
| -rwxr-xr-x | components/0030-verify-checksums | 2 | ||||
| -rwxr-xr-x | components/9990-aaa-fixme.sh | 11 |
3 files changed, 15 insertions, 15 deletions
diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook index 560dd0f..76f4218 100755 --- 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 diff --git a/components/0030-verify-checksums b/components/0030-verify-checksums index 3249b34..dd1c8f8 100755 --- a/components/0030-verify-checksums +++ b/components/0030-verify-checksums @@ -72,7 +72,7 @@ Verify_checksums () # Unmount live-media cd / - umount -f ${_MOUNTPOINT} > /dev/null 2>&1 + umount -f "${_MOUNTPOINT}" > /dev/null 2>&1 sync # Attempt to remount all mounted filesystems read-only diff --git a/components/9990-aaa-fixme.sh b/components/9990-aaa-fixme.sh index 416d6b4..6fc12f9 100755 --- a/components/9990-aaa-fixme.sh +++ b/components/9990-aaa-fixme.sh @@ -1,6 +1,7 @@ #!/bin/sh -export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin" +PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin" +export PATH echo "/root/lib" >> /etc/ld.so.conf echo "/root/usr/lib" >> /etc/ld.so.conf @@ -15,10 +16,7 @@ mkdir -p "${mountpoint}" tried="/tmp/tried" # Create /etc/mtab for debug purpose and future syncs -if [ ! -d /etc ] -then - mkdir /etc/ -fi +mkdir -p /etc if [ ! -f /etc/mtab ] then @@ -28,7 +26,8 @@ fi if [ ! -x "/bin/fstype" ] then # klibc not in path -> not in initramfs - export PATH="${PATH}:/usr/lib/klibc/bin" + PATH="${PATH}:/usr/lib/klibc/bin" + export PATH fi # handle upgrade path from old udev (using udevinfo) to |