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

slotmigrate: sector counts from sysfs; log to kmsg

Browse Source 
The image's busybox has no blockdev applet, so the grow path silently
skipped. Sector counts now come from /sys/class/block (no external
tool); log lines also go to /dev/kmsg so migration results are visible
in dmesg after boot.
This commit is contained in:
ScottW514
2026-08-08 12:59:21 -04:00
parent 63792a8ed2
commit cea0439e17
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-forgefirm/recipes-forgefirm/slotmigrate/files/slotmigrate
+9 -4
View File
@@ -16,7 +16,10 @@
DISK=/dev/mmcblk2 DISK=/dev/mmcblk2
P3=${DISK}p3 P3=${DISK}p3
log () { echo "slotmigrate: $*"; } log () {
echo "slotmigrate: $*"
echo "slotmigrate: $*" > /dev/kmsg 2>/dev/null
}
case "$1" in case "$1" in
start|"") ;; start|"") ;;
@@ -48,10 +51,11 @@ if sfdisk -d "$DISK" 2>/dev/null | grep -q "^${DISK}p4"; then
partx -d --nr 4 "$DISK" 2>/dev/null partx -d --nr 4 "$DISK" 2>/dev/null
fi fi
DISK_SECT=$(blockdev --getsz "$DISK") DISK_SECT=$(cat /sys/class/block/mmcblk2/size 2>/dev/null)
P3_START=$(sfdisk -d "$DISK" 2>/dev/null | sed -n "s|^${P3} : start=[ ]*\([0-9]*\),.*|\1|p") P3_START=$(sfdisk -d "$DISK" 2>/dev/null | sed -n "s|^${P3} : start=[ ]*\([0-9]*\),.*|\1|p")
P3_SIZE=$(sfdisk -d "$DISK" 2>/dev/null | sed -n "s|^${P3} .*size=[ ]*\([0-9]*\),.*|\1|p") P3_SIZE=$(sfdisk -d "$DISK" 2>/dev/null | sed -n "s|^${P3} .*size=[ ]*\([0-9]*\),.*|\1|p")
[ -n "$P3_START" ] && [ -n "$P3_SIZE" ] || { log "cannot read p3 geometry"; exit 0; } [ -n "$DISK_SECT" ] && [ -n "$P3_START" ] && [ -n "$P3_SIZE" ] \
|| { log "cannot read disk/p3 geometry"; exit 0; }
if [ $((P3_START + P3_SIZE)) -lt "$DISK_SECT" ]; then if [ $((P3_START + P3_SIZE)) -lt "$DISK_SECT" ]; then
log "growing p3 to the end of the disk ($((P3_START + P3_SIZE)) -> $DISK_SECT sectors)" log "growing p3 to the end of the disk ($((P3_START + P3_SIZE)) -> $DISK_SECT sectors)"
@@ -61,7 +65,8 @@ if [ $((P3_START + P3_SIZE)) -lt "$DISK_SECT" ]; then
fi fi
# --- filesystem ---------------------------------------------------------- # --- filesystem ----------------------------------------------------------
PART_SECT=$(blockdev --getsz "$P3") PART_SECT=$(cat /sys/class/block/mmcblk2p3/size 2>/dev/null)
[ -n "$PART_SECT" ] || { log "cannot read p3 size"; exit 0; }
FS_BLOCKS=$(tune2fs -l "$P3" 2>/dev/null | sed -n 's/^Block count:[ ]*//p') FS_BLOCKS=$(tune2fs -l "$P3" 2>/dev/null | sed -n 's/^Block count:[ ]*//p')
FS_BSIZE=$(tune2fs -l "$P3" 2>/dev/null | sed -n 's/^Block size:[ ]*//p') FS_BSIZE=$(tune2fs -l "$P3" 2>/dev/null | sed -n 's/^Block size:[ ]*//p')
[ -n "$FS_BLOCKS" ] && [ -n "$FS_BSIZE" ] || { log "cannot read p3 filesystem"; exit 0; } [ -n "$FS_BLOCKS" ] && [ -n "$FS_BSIZE" ] || { log "cannot read p3 filesystem"; exit 0; }