d1f766d2b8
* export-noobs/prerun.sh: Use nested mountpoint While it seems elegant and intuitive to use separate bootfs and rootfs mountpoints for compressing the partitions, doing so violates a precondition of unmount_image that they be mounted as a tree. This causes the image to not be properly unmounted and detached. A better solution might be to pack up the previous stage's chroot directory, but that rework can wait for the time being. scripts/common.sh: Output device name correctly A misplaced ) in unmount_image caused the loop device to be incorrectly identified, resulting in a fair bit of chaos trying to unmount other filesystems on /dev/mapper devices. Such as / on a LUKS-encrypted installation, for example. The unmount will fail as it should and build.sh will abort the build without any cleanup. Best to avoid that. These changes close RPi-Distro/pi-gen#19
26 lines
850 B
Bash
Executable File
26 lines
850 B
Bash
Executable File
#!/bin/bash -e
|
|
|
|
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
|
|
NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
|
|
unmount_image ${IMG_FILE}
|
|
|
|
mkdir -p ${STAGE_WORK_DIR}
|
|
cp ${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img ${STAGE_WORK_DIR}/
|
|
|
|
rm -rf ${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}
|
|
|
|
LOOP_DEV=`kpartx -asv ${IMG_FILE} | grep -E -o -m1 'loop[[:digit:]]+' | head -n 1`
|
|
BOOT_DEV=/dev/mapper/${LOOP_DEV}p1
|
|
ROOT_DEV=/dev/mapper/${LOOP_DEV}p2
|
|
|
|
mkdir -p ${STAGE_WORK_DIR}/rootfs
|
|
mkdir -p ${NOOBS_DIR}
|
|
|
|
mount $ROOT_DEV ${STAGE_WORK_DIR}/rootfs
|
|
mount $BOOT_DEV ${STAGE_WORK_DIR}/rootfs/boot
|
|
|
|
tar -I pxz -C ${STAGE_WORK_DIR}/rootfs/boot -cpf ${NOOBS_DIR}/boot.tar.xz .
|
|
tar -I pxz -C ${STAGE_WORK_DIR}/rootfs --one-file-system -cpf ${NOOBS_DIR}/root.tar.xz .
|
|
|
|
unmount_image ${IMG_FILE}
|