From 1e0339a4e36f85f468ecbdc21c645541f51e5e56 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Wed, 11 Mar 2020 18:43:12 +0000 Subject: remove obsolete loop-aes-utils related losetup hack 677415f6d7efc1e5b888570d70af311d2900c69c (2007) in v1.0~a2-1 added a hack relating to the loop-aes-utils package and losetup. this commit bundled a bunch of changes, it was not specific to the hack, and so info about the hack is limited to a brief comment included within the related change in defaults: ``` # Workaround for loop-aes-utils divertion # (loop-aes-utils' losetup lacks features). ``` though it is very similar to the removed fdisk hack in that it seems that one package may replace a binary from another, moving the original to a new location, and this hack gives the user the opportunity to select the original instead of the one put in its place, for use in LB. the comment mentions a package called loop-aes-utils as being the package that performs such a diversion, and that the need for the hack was that losetup itself lacked features, presumably encryption support, and it is clear that it is the losetup binary that is the focus of the diversion. looking into the history of loop-aes-utils a little, this package was dropped from debian back in 2012 (#680748), favouring encrytion support of dm-crypt/cryptsetup. double checking file contents of packages, only the mount package carries an /sbin/losetup file, so presumably this means that dm-setup/cryptsetup do not perform such a diversion of losetup (i.e. their use is exclusively done directly). since the possible diversion is simply gone, that completely removes any point in having the hack of giving users choice between losetup and the diverted one. so let's remove this obsolete hack... --- scripts/build/binary_hdd | 5 +++-- scripts/build/config | 9 ++------- scripts/build/source_hdd | 5 +++-- 3 files changed, 8 insertions(+), 11 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index 23cc4f0e2..a4ef83170 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -54,6 +54,7 @@ esac Check_package chroot /usr/share/doc/mtools mtools Check_package chroot /sbin/parted parted Check_package host /sbin/fdisk fdisk +Check_package host /sbin/losetup mount echo "${LB_BOOTLOADERS}" | \ while IFS="," read -r BOOTLOADER @@ -145,7 +146,7 @@ else fi dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM} -FREELO="$(${LB_LOSETUP} -f)" +FREELO="$(losetup -f)" MAKEDEV=false if [ ! -b chroot/${FREELO} ] then @@ -223,7 +224,7 @@ esac Lodetach ${FREELO} -FREELO="$(${LB_LOSETUP} -f)" +FREELO="$(losetup -f)" Losetup $FREELO chroot/binary.img 1 case "${LB_BINARY_FILESYSTEM}" in diff --git a/scripts/build/config b/scripts/build/config index 4ec2ea8e9..0f84c28c7 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -89,7 +89,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\ \t [--linux-packages \"PACKAGES\"]\n\ \t [--loadlin true|false]\n\ -\t [--losetup losetup|losetup.orig]\n\ \t [--memtest memtest86+|memtest86|none]\n\ \t [--mirror-binary URL]\n\ \t [--mirror-binary-security URL]\n\ @@ -140,7 +139,7 @@ Local_arguments () LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitude-options:,debootstrap-options:,debootstrap-script:, apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,cache:,cache-indices:,cache-packages:, cache-stages:,debconf-frontend:,debconf-priority:,dump, - initramfs:,initramfs-compression:,initsystem:,losetup:,mode:,system:,tasksel:, + initramfs:,initramfs-compression:,initsystem:,mode:,system:,tasksel:, architectures:,clean, distribution:,parent-distribution:,parent-debian-installer-distribution:, distribution-chroot:,parent-distribution-chroot:, @@ -334,7 +333,7 @@ Local_arguments () ;; --losetup) - LB_LOSETUP="${2}" + Echo_warning "--losetup is an obsolete option" shift 2 ;; @@ -1010,10 +1009,6 @@ LB_INITRAMFS_COMPRESSION="${LB_INITRAMFS_COMPRESSION}" # (Default: ${LB_INITSYSTEM}) LB_INITSYSTEM="${LB_INITSYSTEM}" -# \$LB_LOSETUP: set losetup program -# (Default: autodetected) -LB_LOSETUP="${LB_LOSETUP}" - # \$LB_MODE: set distribution mode # (Default: ${LB_MODE}) LB_MODE="${LB_MODE}" diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd index 98c9b01e6..123e758fa 100755 --- a/scripts/build/source_hdd +++ b/scripts/build/source_hdd @@ -49,6 +49,7 @@ Create_lockfile .lock Check_package chroot /sbin/mkdosfs dosfstools Check_package chroot /sbin/parted parted Check_package host /sbin/fdisk fdisk +Check_package host /sbin/losetup mount # Installing depends Install_package @@ -64,7 +65,7 @@ DU_DIM="$(du -ms source | cut -f1)" REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})" dd if=/dev/zero of=${LIVE_IMAGE_NAME}-source.img bs=1024k count=0 seek=${REAL_DIM} MAKEDEV=false -FREELO="$(${LB_LOSETUP} -f)" +FREELO="$(losetup -f)" if [ ! -b chroot/${FREELO} ] then MAKEDEV=true @@ -136,7 +137,7 @@ rmdir source.tmp Lodetach ${FREELO} Echo_warning "!!! The above error/warning messages can be ignored !!!" -FREELO="$(${LB_LOSETUP} -f)" +FREELO="$(losetup -f)" Losetup "$FREELO" ${LIVE_IMAGE_NAME}-source.img 0 Chroot chroot "parted -s ${FREELO} set 1 lba off" || true Lodetach ${FREELO} -- cgit v1.2.3