Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-10 10:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some thinkos in the loop device name handling

Browse Source
This commit is contained in:
Steve Langasek 2016-02-06 18:21:49 -08:00
parent 4594c28c1f
commit e9d31ea96a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
live-build/ubuntu-cpc/functions
View File

@ -52,12 +52,8 @@ mount_image() {
exit 1
fi
# don't assume we know the separator between device number and partition
# number in the partition name, as this has changed over time.
partsep=$(echo "$loop_p1" | sed -e's/^loop[0-9]\+\(.*\)[0-9]\+/\1/')
# Find the rootfs location
rootfs_dev_mapper="/dev/mapper/${loop_device}${partsep}${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

2
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -59,7 +59,7 @@ mkdir mountpoint
mount "${rootfs_dev_mapper}" mountpoint
if [ -n "$BOOT_MOUNTPOINT" ]; then
boot_dev_mapper="${rootfs_dev_mapper%[0-9]*}1"
boot_dev_mapper="${rootfs_dev_mapper%%[0-9]}1"
# assume fat32 for now
mkfs.vfat -n system-boot "$boot_dev_mapper"
mkdir -p "mountpoint/$BOOT_MOUNTPOINT"