vh/forgefirm
1
0
Fork 0
mirror of https://github.com/openglow-org/forgefirm.git synced 2026-09-27 16:51:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

probes: reuse existing slot mounts; explicit -t ext4

Browse Source 
The image's fstab keeps the factory slots mounted under /factory, and
busybox mount's auto-type iteration against an already-mounted ext4
device provokes a cosmetic kernel 'Can't open blockdev' for each
foreign-type claim (reproduced and pinned on the bench: ext3-typed
mount of an ext4-held device prints it; ext4-typed does not). Probes
now reuse an existing mountpoint from /proc/mounts and mount fresh
targets with an explicit -t ext4.
This commit is contained in:
ScottW514
2026-08-08 13:13:20 -04:00
parent 42a01940f1
commit 0f5dec57e9
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install-forgefirm.sh
+11 -7
View File
@@ -76,21 +76,25 @@ archive_dev () {
# read-only under /tmp (newer factory firmware has no /factory/imgN
# mounts, and the rootfs is read-only).
slot_probe () {
S_TYPE=unknown; S_VER=""
S_TYPE=unknown; S_VER=""; S_MOUNTED=""
if [ "$1" = "$ACTIVE" ]; then
RD=""
else
RD="/tmp/ffinstall.probe.$$"
mkdir -p "$RD" || return 1
mount -o ro "/dev/mmcblk2p$1" "$RD" 2>/dev/null \
|| { rmdir "$RD" 2>/dev/null; return 1; }
RD=$(sed -n "s|^/dev/mmcblk2p$1 \([^ ]*\).*|\1|p" /proc/mounts | head -n 1)
if [ -z "$RD" ]; then
RD="/tmp/ffinstall.probe.$$"
S_MOUNTED=yes
mkdir -p "$RD" || return 1
mount -o ro -t ext4 "/dev/mmcblk2p$1" "$RD" 2>/dev/null \
|| { rmdir "$RD" 2>/dev/null; return 1; }
fi
fi
if [ -f "$RD/etc/forgefirm-version" ]; then
S_TYPE=forgefirm; S_VER=$(cat "$RD/etc/forgefirm-version")
elif [ -f "$RD/etc/version" ]; then
S_TYPE=factory; S_VER=$(cat "$RD/etc/version")
fi
if [ -n "$RD" ]; then
if [ -n "$S_MOUNTED" ]; then
umount "$RD" 2>/dev/null
rmdir "$RD" 2>/dev/null
fi
@@ -235,7 +239,7 @@ rm -f "$KEYFILE"
# --- post-write verify --------------------------------------------------------
MP="/tmp/ffinstall.verify.$$"
mkdir -p "$MP"
mount -o ro "/dev/mmcblk2p$TARGET" "$MP" || die "new rootfs does not mount"
mount -o ro -t ext4 "/dev/mmcblk2p$TARGET" "$MP" || die "new rootfs does not mount"
NEWVER=$(cat "$MP/etc/forgefirm-version" 2>/dev/null)
[ -n "$NEWVER" ] || { umount "$MP"; die "new rootfs has no ForgeFIRM version stamp"; }
[ -f "$MP/boot/zImage" ] || { umount "$MP"; die "new rootfs has no kernel"; }