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

installer: confirm target-slot content; record semantic version

Browse Source 
Before writing the target slot, the installer now shows what it holds
(factory firmware v<ver>, ForgeFIRM, an unrecognized filesystem, or
unknown/unreadable content). Factory images are archived as before;
anything else requires the operator to type ERASE, since it is
overwritten without a backup. The archive manifest now records the
semantic FIRMWARE_VERSION (ver=), which the update manager displays in
the restore list. Bump forgectrl to the matching GUI change.
This commit is contained in:
ScottW514
2026-08-08 14:54:28 -04:00
parent e9d3ce40a8
commit 501e1d4591
2 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
+1 -1
View File
@@ -9,7 +9,7 @@ PV = "0.1.0"
SRC_URI = "git://github.com/ScottW514/forgectrl.git;protocol=https;branch=main"
# Pinned; bump deliberately after pushing forgectrl changes.
SRCREV = "41ed14aee9970bdf00ad60e7577c7cf2b84fc513"
SRCREV = "4ae49a2bb969014e8369d8983ed37247d68e3daa"
S = "${WORKDIR}/git"
scripts/install-forgefirm.sh
+47 -8
View File
@@ -70,12 +70,15 @@ archive_dev () {
[ "$GZRC" = "0" ] && [ "$DDRC" = "0" ]
}
# slot_probe <1|2>: sets S_TYPE (factory|forgefirm|unknown) and S_VER.
# The active slot is read from the running rootfs; others are mounted
# read-only under /tmp (newer factory firmware has no /factory/imgN
# mounts, and the rootfs is read-only).
# slot_probe <1|2>: sets S_TYPE (factory|forgefirm|empty|unknown),
# S_VER (the build datetime, used for archive naming), and S_FWVER (the
# semantic FIRMWARE_VERSION, for display; factory only). The active slot
# is read from the running rootfs; others are mounted read-only under
# /tmp (newer factory firmware has no /factory/imgN mounts, and the
# rootfs is read-only). Sets S_TYPE=empty for a mountable-but-unknown
# filesystem and S_TYPE=unknown when the slot will not even mount.
slot_probe () {
S_TYPE=unknown; S_VER=""; S_MOUNTED=""
S_TYPE=unknown; S_VER=""; S_FWVER=""; S_MOUNTED=""
if [ "$1" = "$ACTIVE" ]; then
RD=""
else
@@ -85,13 +88,17 @@ slot_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; }
|| { rmdir "$RD" 2>/dev/null; S_TYPE=unknown; return 0; }
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")
S_FWVER=$(sed -n 's/^FIRMWARE_VERSION[[:space:]]*=[[:space:]]*\([^[:space:]]*\).*/\1/p' \
"$RD/etc/build" 2>/dev/null)
else
S_TYPE=empty
fi
if [ -n "$S_MOUNTED" ]; then
umount "$RD" 2>/dev/null
@@ -99,6 +106,17 @@ slot_probe () {
fi
}
# Human label for the last slot_probe result.
slot_desc () {
case "$S_TYPE" in
factory) [ -n "$S_FWVER" ] && echo "factory firmware v$S_FWVER" \
|| echo "factory firmware $S_VER" ;;
forgefirm) echo "ForgeFIRM $S_VER" ;;
empty) echo "an unrecognized filesystem" ;;
*) echo "unknown/unreadable content" ;;
esac
}
# Verified atomic env flip (all four variables, classic u-boot-tools script
# format first - that is what factory firmware ships - then libubootenv
# format, then per-variable writes; read-back verified in every case).
@@ -174,6 +192,27 @@ echo
echo -e "Booted slot: $ACTIVE - ForgeFIRM will be installed to slot $TARGET."
echo -e "The factory firmware in slot $ACTIVE stays installed and bootable."
echo
# What is in the target slot, and will it be archived first? The archive
# step below backs up factory images; anything else in the target slot
# is overwritten without a backup, so make that explicit.
slot_probe "$TARGET"
TARGET_DESC=$(slot_desc)
echo -e "Slot $TARGET currently holds: ${BRIGHT}$TARGET_DESC${RESET}"
if [ "$S_TYPE" = "factory" ]; then
echo -e "It will be archived to /data before being overwritten."
else
echo -e "${YELLOW}!! This is NOT factory firmware and will NOT be archived.${RESET}"
echo -e "${YELLOW}!! Its contents will be permanently destroyed.${RESET}"
echo
read -p "Type ERASE to overwrite slot $TARGET, or anything else to abort: " erase
echo
if [ "$erase" != "ERASE" ]; then
echo "Aborting without changes."
exit 0
fi
fi
echo
read -p "Are you sure you want to continue [N/y]? " continue
echo
if [ "$continue" != "y" ]; then
@@ -193,10 +232,10 @@ for N in 1 2; do
echo -e "${ASTERISK}Slot $N (factory $S_VER) already archived."
continue
fi
echo -e "${ASTERISK}Archiving slot $N (factory $S_VER) - takes a few minutes:"
echo -e "${ASTERISK}Archiving slot $N ($(slot_desc)) - takes a few minutes:"
archive_dev /dev/mmcblk2p$N "$ARC" \
|| { rm -f "$ARC"; die "archiving slot $N failed"; }
echo "$(date '+%Y-%m-%d %H:%M:%S') slot$N factory $S_VER $(basename $ARC) md5=$(md5sum "$ARC" | cut -d' ' -f1)" >> "$ARCHIVE_DIR/manifest"
echo "$(date '+%Y-%m-%d %H:%M:%S') slot$N factory $S_VER ver=${S_FWVER:-unknown} $(basename $ARC) md5=$(md5sum "$ARC" | cut -d' ' -f1)" >> "$ARCHIVE_DIR/manifest"
done
for B in 0 1; do
ARC="$ARCHIVE_DIR/recovery-boot$B.img.gz"