Relentnet/MarineComOS_RPI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Adds call to mknod if loop dev does not exist after call to losetup -f (#483)

Browse Source
This commit is contained in:
bamartin125 2023-08-17 10:24:47 -05:00 committed by GitHub
parent 01d24ef227
commit 446f3e34c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
export-image/prerun.sh
View File

@ -35,7 +35,7 @@ if [ "${NO_PRERUN_QCOW2}" = "0" ]; then
echo "Creating loop device..." echo "Creating loop device..."
cnt=0 cnt=0
until LOOP_DEV="$(losetup --show --find --partscan "$IMG_FILE")"; do until ensure_next_loopdev && LOOP_DEV="$(losetup --show --find --partscan "$IMG_FILE")"; do
if [ $cnt -lt 5 ]; then if [ $cnt -lt 5 ]; then
cnt=$((cnt + 1)) cnt=$((cnt + 1))
echo "Error in losetup. Retrying..." echo "Error in losetup. Retrying..."

2
export-noobs/prerun.sh
View File

@ -11,7 +11,7 @@ rm -rf "${NOOBS_DIR}"
echo "Creating loop device..." echo "Creating loop device..."
cnt=0 cnt=0
until LOOP_DEV="$(losetup --show --find --partscan "$IMG_FILE")"; do until ensure_next_loopdev && LOOP_DEV="$(losetup --show --find --partscan "$IMG_FILE")"; do
if [ $cnt -lt 5 ]; then if [ $cnt -lt 5 ]; then
cnt=$((cnt + 1)) cnt=$((cnt + 1))
echo "Error in losetup. Retrying..." echo "Error in losetup. Retrying..."

8
scripts/common
View File

@ -102,3 +102,11 @@ update_issue() {
echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using ${PI_GEN}, ${PI_GEN_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue" echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using ${PI_GEN}, ${PI_GEN_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue"
} }
export -f update_issue export -f update_issue
ensure_next_loopdev() {
local loopdev
loopdev="$(losetup -f)"
loopmaj="$(echo "$loopdev" | sed -E 's/.*[^0-9]*?([0-9]+)$/\1/')"
[[ -b "$loopdev" ]] || mknod "$loopdev" b 7 "$loopmaj"
}
export -f ensure_next_loopdev