From 1931bbcb194febe241aa82f03a6730ba82a84409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 24 May 2023 11:06:56 +0200 Subject: [PATCH] Revert "Revert "Revert the recent kpartx->losetup changes, as we need to put some other changes on top. Let's try to re-introduce this for MM."" This reverts commit ada1f09b39332ec828369e0a30f2870df5c4dc3e. --- debian/control | 1 - .../buildd/hooks/02-disk-image-uefi.binary | 2 +- live-build/functions | 18 ++++++++---- .../hooks.d/base/disk-image-ppc64el.binary | 2 +- .../hooks.d/base/disk-image-uefi.binary | 28 +++++++++---------- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/debian/control b/debian/control index b1ad7323..c8c78a76 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Depends: ${misc:Depends}, lsb-release, lzma, make, - mount, parted, procps, python3, diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary index 44a7ff42..d358596a 100755 --- a/live-build/buildd/hooks/02-disk-image-uefi.binary +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary @@ -41,7 +41,7 @@ create_partitions() { } create_and_mount_uefi_partition() { - uefi_dev="${loop_device}p15" + uefi_dev="/dev/mapper${loop_device///dev/}p15" mountpoint="$1" mkfs.vfat -F 32 -n UEFI "${uefi_dev}" diff --git a/live-build/functions b/live-build/functions index b21a8518..c00a06b5 100644 --- a/live-build/functions +++ b/live-build/functions @@ -12,13 +12,16 @@ loop_raw= backing_img= clean_loops() { - if [ -n "${loop_device}" ]; then + local kpartx_ret + local kpartx_stdout + + if [ -n "${backing_img}" ]; then # If something just finished writing to the device or a # partition (e.g. the zerofree in umount_partition) udev might # still be processing the device. udevadm settle sync - losetup -v -d "${loop_device}" + kpartx -v -d "${backing_img}" unset backing_img fi @@ -62,15 +65,18 @@ mount_image() { trap clean_loops EXIT backing_img="$1" local rootpart="$2" - loop_device=$(losetup --show -f -P -v ${backing_img}) + kpartx_mapping="$(kpartx -s -v -a ${backing_img})" + # Find the loop device + loop_p1="$(echo -e ${kpartx_mapping} | head -n1 | awk '{print$3}')" + loop_device="/dev/${loop_p1%p[0-9]*}" if [ ! -b ${loop_device} ]; then echo "unable to find loop device for ${backing_img}" exit 1 fi # Find the rootfs location - rootfs_dev_mapper="${loop_device}p${rootpart}" + rootfs_dev_mapper="/dev/mapper/${loop_p1%%[0-9]}${rootpart}" if [ ! -b "${rootfs_dev_mapper}" ]; then echo "${rootfs_dev_mapper} is not a block device"; exit 1 @@ -207,7 +213,7 @@ mount_disk_image() { mount_image ${disk_image} 1 mount_partition "${rootfs_dev_mapper}" $mountpoint - local uefi_dev="${loop_device}p15" + local uefi_dev="/dev/mapper${loop_device///dev/}p15" if [ -b ${uefi_dev} -a -e $mountpoint/boot/efi ]; then mount "${uefi_dev}" $mountpoint/boot/efi fi @@ -248,7 +254,7 @@ umount_partition() { umount_disk_image() { mountpoint="$1" - local uefi_dev="${loop_device}p15" + local uefi_dev="/dev/mapper${loop_device///dev/}p15" if [ -e "$mountpoint/boot/efi" -a -b "$uefi_dev" ]; then # zero fill free space in UEFI partition cat < /dev/zero > "$mountpoint/boot/efi/bloat_file" 2> /dev/null || true diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary index b5b7cffc..dc87a361 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary @@ -49,7 +49,7 @@ GRUB_TIMEOUT=0 # Set the default commandline GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk" EOF - prep_partition="${loop_device}p2" + prep_partition="/dev/mapper${loop_device///dev/}p2" chroot mountpoint grub-install "${prep_partition}" \ --no-nvram \ --boot-directory=/boot \ diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 042db427..91e77516 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -197,7 +197,7 @@ create_partitions() { } create_and_mount_uefi_partition() { - uefi_dev="${loop_device}p15" + uefi_dev="/dev/mapper${loop_device///dev/}p15" mountpoint="$1" mkfs.vfat -F 32 -n UEFI "${uefi_dev}" @@ -234,7 +234,7 @@ install_grub() { # Server preinstalled image # Setup cidata sample data & nocloud fallback # Allows login on first boot with or without metadata - cidata_dev="${loop_device}p14" + cidata_dev="/dev/mapper${loop_device///dev/}p14" setup_cidata "${cidata_dev}" setup_cinocloud mountpoint fi @@ -246,7 +246,7 @@ install_grub() { # Server preinstalled image # Setup cidata sample data & nocloud fallback # Allows login on first boot with or without metadata - cidata_dev="${loop_device}p14" + cidata_dev="/dev/mapper${loop_device///dev/}p14" setup_cidata "${cidata_dev}" setup_cinocloud mountpoint fi @@ -258,7 +258,7 @@ install_grub() { # Server preinstalled image # Setup cidata sample data & nocloud fallback # Allows login on first boot with or without metadata - cidata_dev="${loop_device}p13" + cidata_dev="/dev/mapper${loop_device///dev/}p13" setup_cidata "${cidata_dev}" setup_cinocloud mountpoint fi @@ -285,10 +285,10 @@ install_grub() { efi_target=riscv64-efi # The real U-Boot chroot mountpoint apt-get install -qqy u-boot-microchip - loader="${loop_device}p13" + loader="/dev/mapper${loop_device///dev/}p13" dd if=mountpoint/usr/lib/u-boot/microchip_icicle/u-boot.payload of=$loader # Provide end-user modifyable CIDATA - cidata_dev="${loop_device}p12" + cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}" # Provide stock nocloud datasource # Allow interactive login on baremetal board, @@ -330,10 +330,10 @@ install_grub() { chroot mountpoint apt-get install -qqy u-boot-nezha # Since version 2022.10 U-Boot SPL and U-Boot are installed onto the same partition. # Package nezha-boot0 is not needed anymore. - loader1="${loop_device}p13" + loader1="/dev/mapper${loop_device///dev/}p13" dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot-sunxi-with-spl.bin of=$loader1 # Provide end-user modifyable CIDATA - cidata_dev="${loop_device}p12" + cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}" # Provide stock nocloud datasource # Allow interactive login on baremetal SiFive board, @@ -359,7 +359,7 @@ install_grub() { efi_target=riscv64-efi # factory u-boot requires a p3 partition with /boot/uEnv.txt file - uenv_dev="${loop_device}p3" + uenv_dev="/dev/mapper${loop_device///dev/}p3" mkfs.ext4 "${uenv_dev}" uenv_mnt_dir=`mktemp -d uenvXXX` mount "${uenv_dev}" "${uenv_mnt_dir}" @@ -387,7 +387,7 @@ EOF umount "${uenv_mnt_dir}" rmdir "${uenv_mnt_dir}" # Provide end-user modifyable CIDATA - cidata_dev="${loop_device}p12" + cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}" # Provide stock nocloud datasource # Allow interactive login on baremetal SiFive board, @@ -406,7 +406,7 @@ EOF chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' efi_target=riscv64-efi # Provide end-user modifyable CIDATA - cidata_dev="${loop_device}p12" + cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}" # Provide stock nocloud datasource # Allow interactive login on baremetal board, @@ -431,13 +431,13 @@ EOF fi chroot mountpoint apt-get install -qqy u-boot-sifive # FSBL, which gets U-Boot SPL - loader1="${loop_device}p13" + loader1="/dev/mapper${loop_device///dev/}p13" # The real U-Boot - loader2="${loop_device}p14" + loader2="/dev/mapper${loop_device///dev/}p14" dd if=mountpoint/usr/lib/u-boot/${u_boot_arch}/u-boot-spl.bin of=$loader1 dd if=mountpoint/usr/lib/u-boot/${u_boot_arch}/u-boot.itb of=$loader2 # Provide end-user modifyable CIDATA - cidata_dev="${loop_device}p12" + cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}" # Provide stock nocloud datasource # Allow interactive login on baremetal SiFive board,