diff -Naur dracut-045/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh dracut-045-busybox-losetup/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh --- dracut-045/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox-losetup/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh 2017-04-07 14:38:41.708878555 +0200 @@ -2,7 +2,7 @@ if [ "${root%%:*}" = "liveiso" ]; then { - printf 'KERNEL=="loop-control", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root `/sbin/losetup -f --show %s`"\n' \ + printf 'KERNEL=="loop-control", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root `/sbin/losetup -f %s`"\n' \ ${root#liveiso:} } >> /etc/udev/rules.d/99-liveiso-mount.rules fi diff -Naur dracut-045/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-045-busybox-losetup/modules.d/90dmsquash-live/dmsquash-live-root.sh --- dracut-045/modules.d/90dmsquash-live/dmsquash-live-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox-losetup/modules.d/90dmsquash-live/dmsquash-live-root.sh 2017-04-07 14:39:31.513407425 +0200 @@ -113,7 +113,7 @@ [ -n "$readonly_overlay" ] && opt=-r mount -n -t auto $devspec /run/initramfs/overlayfs || : if [ -f /run/initramfs/overlayfs$pathspec -a -w /run/initramfs/overlayfs$pathspec ]; then - OVERLAY_LOOPDEV=$(losetup -f --show $opt /run/initramfs/overlayfs$pathspec) + OVERLAY_LOOPDEV=$(losetup -f $opt /run/initramfs/overlayfs$pathspec) over=$OVERLAY_LOOPDEV umount -l /run/initramfs/overlayfs || : oltype=$(det_img_fs $OVERLAY_LOOPDEV) @@ -196,10 +196,10 @@ else dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size*1024)) 2> /dev/null if [ -n "$setup" -a -n "$readonly_overlay" ]; then - RO_OVERLAY_LOOPDEV=$(losetup -f --show /overlay) + RO_OVERLAY_LOOPDEV=$(losetup -f /overlay) over=$RO_OVERLAY_LOOPDEV else - OVERLAY_LOOPDEV=$(losetup -f --show /overlay) + OVERLAY_LOOPDEV=$(losetup -f /overlay) over=$OVERLAY_LOOPDEV fi fi @@ -228,8 +228,8 @@ dd if=/dev/null of=/run/initramfs/thin-overlay/meta bs=1b count=1 seek=$((thin_meta_sz)) 2> /dev/null dd if=/dev/null of=/run/initramfs/thin-overlay/data bs=1b count=1 seek=$((thin_data_sz)) 2> /dev/null - THIN_META_LOOPDEV=$( losetup --show -f /run/initramfs/thin-overlay/meta ) - THIN_DATA_LOOPDEV=$( losetup --show -f /run/initramfs/thin-overlay/data ) + THIN_META_LOOPDEV=$( losetup -f /run/initramfs/thin-overlay/meta ) + THIN_DATA_LOOPDEV=$( losetup -f /run/initramfs/thin-overlay/data ) echo 0 $thin_data_sz thin-pool $THIN_META_LOOPDEV $THIN_DATA_LOOPDEV 1024 1024 | dmsetup create live-overlay-pool dmsetup message /dev/mapper/live-overlay-pool 0 "create_thin 0" @@ -321,7 +321,7 @@ setup=yes fi fi - BASE_LOOPDEV=$(losetup -f --show $opt $FSIMG) + BASE_LOOPDEV=$(losetup -f $opt $FSIMG) sz=$(blockdev --getsz $BASE_LOOPDEV) if [ "$setup" == rw ]; then echo 0 $sz linear $BASE_LOOPDEV 0 | dmsetup create live-rw diff -Naur dracut-045/modules.d/91crypt-loop/crypt-loop-lib.sh dracut-045-busybox-losetup/modules.d/91crypt-loop/crypt-loop-lib.sh --- dracut-045/modules.d/91crypt-loop/crypt-loop-lib.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox-losetup/modules.d/91crypt-loop/crypt-loop-lib.sh 2017-04-07 14:41:35.855216384 +0200 @@ -19,7 +19,7 @@ local key="/dev/mapper/${mntp##*/}" if [ ! -b $key ]; then - local loopdev=$(losetup -f "${mntp}/${keypath}" --show) + local loopdev=$(losetup -f "${mntp}/${keypath}") local opts="-d - luksOpen $loopdev ${key##*/}" ask_for_password \ diff -Naur dracut-045/modules.d/99img-lib/img-lib.sh dracut-045-busybox-losetup/modules.d/99img-lib/img-lib.sh --- dracut-045/modules.d/99img-lib/img-lib.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox-losetup/modules.d/99img-lib/img-lib.sh 2017-04-07 14:41:01.855543969 +0200 @@ -21,7 +21,7 @@ # determine filesystem type for a filesystem image det_fs_img() { - local dev=$(losetup --find --show "$1") rv="" + local dev=$(losetup -f "$1") rv="" det_fs $dev; rv=$? losetup -d $dev return $rv