adamcarr/pi-swarm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flash-one.sh: tolerate umount when nothing is mounted

Browse Source
This commit is contained in:
Adam Carr
2026-09-19 12:53:09 -07:00
parent 7d5e6f5be1
commit a8a61c6c4d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/flash-one.sh
View File

@@ -43,7 +43,7 @@ echo ",+" | sfdisk --no-reread -N 2 /dev/$DEV
for i in $(seq 1 10); do for i in $(seq 1 10); do
partprobe /dev/$DEV 2>/dev/null || true partprobe /dev/$DEV 2>/dev/null || true
udevadm settle 2>/dev/null || true udevadm settle 2>/dev/null || true
umount /dev/${DEV}1 /dev/${DEV}2 2>/dev/null umount /dev/${DEV}1 /dev/${DEV}2 2>/dev/null || true
SIZE2=$(blockdev --getsize64 /dev/${DEV}2 2>/dev/null || echo 0) SIZE2=$(blockdev --getsize64 /dev/${DEV}2 2>/dev/null || echo 0)
[ "$SIZE2" -gt 200000000000 ] && break [ "$SIZE2" -gt 200000000000 ] && break
sleep 1 sleep 1
@@ -57,7 +57,7 @@ B=/mnt/planck-boot
R=/mnt/planck-root R=/mnt/planck-root
mkdir -p $B $R mkdir -p $B $R
for i in 1 2 3; do for i in 1 2 3; do
umount /dev/${DEV}1 /dev/${DEV}2 2>/dev/null umount /dev/${DEV}1 /dev/${DEV}2 2>/dev/null || true
mount /dev/${DEV}1 $B 2>/dev/null && mount /dev/${DEV}2 $R 2>/dev/null && break mount /dev/${DEV}1 $B 2>/dev/null && mount /dev/${DEV}2 $R 2>/dev/null && break
sleep 2 sleep 2
done done