manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass --partscan to losetup 

Recent versions of Linux, parted or some other bit of software cause
partition devices, like /dev/loop0p1 to be created when running parted
mkpart. However, these devices are not cleaned up when running
losetup -d to remove /dev/loop0 later, so they linger around and confuse
mkfs (which refuses to make a filesystem, thinking there are partitions):

	mkfs.fat 4.1 (2017-01-24)
	mkfs.vfat: Partitions or virtual mappings on device '/dev/loop0', not making filesystem (use -I to override)

To prevent this behaviour, pass --partscan to losetup when adding a new
partition, to clean up any lingering partitions. It seems losetup does not
accept --partscan when deleting a loop device, to clean up at that point, but
since binary_hdd mounts the partition last, there should not be any lingering
partition devices after live-build is done.

The --partscan option is available since util-linux 2.21 (released in 2012), so
it should be fairly safe to pass it unconditionally.
This commit is contained in:
Matthijs Kooijman 2017-08-29 15:04:31 +02:00 committed by Raphaël Hertzog
parent e8118e8e0a
commit 4c229d9449
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -2,6 +2,9 @@ live-build (1:20170830) UNRELEASED; urgency=medium
* Auto-update version strings in manual pages.
* Update default value of PREPARER to correct the embedded URL.
* Pass --partscan to losetup to clean up partition devices lingering
from former operations. Closes: #865586
Thanks to Matthijs Kooijman <matthijs@stdin.nl> for the patch.
-- Raphaël Hertzog <hertzog@debian.org> Tue, 29 Aug 2017 15:13:39 +0200

6
functions/losetup.sh
View File

@ -40,7 +40,7 @@ Losetup ()
FILE="${2}"
PARTITION="${3:-1}"
${LB_LOSETUP} --read-only "${DEVICE}" "${FILE}"
${LB_LOSETUP} --read-only --partscan "${DEVICE}" "${FILE}"
FDISK_OUT="$(${LB_FDISK} -l -u ${DEVICE} 2>&1)"
Lodetach "${DEVICE}"
@ -50,14 +50,14 @@ Losetup ()
then
Echo_message "Mounting %s with offset 0" "${DEVICE}"
${LB_LOSETUP} "${DEVICE}" "${FILE}"
${LB_LOSETUP} --partscan "${DEVICE}" "${FILE}"
else
SECTORS="$(echo "$FDISK_OUT" | sed -ne "s|^$LOOPDEVICE[ *]*\([0-9]*\).*|\1|p")"
OFFSET="$(expr ${SECTORS} '*' 512)"
Echo_message "Mounting %s with offset %s" "${DEVICE}" "${OFFSET}"
${LB_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
${LB_LOSETUP} --partscan -o "${OFFSET}" "${DEVICE}" "${FILE}"
fi
}