From 6246e311b3508070b1d76edb600afaff60eb6e47 Mon Sep 17 00:00:00 2001 From: Victor Vogel Date: Sun, 8 Nov 2026 12:49:28 +0000 Subject: [PATCH] MODEM-PLAN, RADIOS-CAMERA-PLAN: find partitions by PARTNAME in M0 The Arch root on the phone has no /dev/disk/by-partlabel, so the M0 commands that read the radio partitions through it fail there: M0.1's checksum loop (both plans), M0.5's blockdev --getro check and 1.6's name-to-device listing. #490 fixed the same lookup in FINGERPRINT-PLAN, and the maintainer asked for these two plans to get the same treatment. Each command now finds its partition the way FB1 and F19.0 do, by PARTNAME in /sys/class/block/*/uevent, and 1.6 lists those PARTNAME lines in place of the by-partlabel symlinks. 1.6's "take a fresh backup" note now points at tools/nv-backup, which finds the partitions the same way. No step does anything else differently: the same partitions are read, nothing is mounted or written. MODEM-PLAN's M0 result note (2026-10-12) records what was run that day and is left as it was. Checked: the changed shell snippets parse (bash -n, sh -n), the lookup picks sda5 for efs over efs_backup on a fake sysfs, tools/pr-check origin/main and tests/all. Docs only; no phone was used. Co-Authored-By: Claude Opus 5.5 --- device/cheetah/MODEM-PLAN.md | 6 ++++-- device/cheetah/RADIOS-CAMERA-PLAN.md | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/device/cheetah/MODEM-PLAN.md b/device/cheetah/MODEM-PLAN.md index 0b9f05962..2bd62cd81 100644 --- a/device/cheetah/MODEM-PLAN.md +++ b/device/cheetah/MODEM-PLAN.md @@ -342,7 +342,8 @@ Same checks as below: full build exits 0 (`logs/kernel-modem7.log`), ```sh # M0.1 partitions unchanged against the 2026-10-11 backup (reads ~430 MB) tools/phone-ssh 'for p in efs efs_backup modem_userdata persist modem_a modem_b; do - printf "%s %s.img\n" "$(sha256sum < /dev/disk/by-partlabel/$p | cut -d" " -f1)" "$p"; done' \ + d=$(grep -lx "PARTNAME=$p" /sys/class/block/*/uevent | head -1 | cut -d/ -f5) + printf "%s %s.img\n" "$(sha256sum < /dev/$d | cut -d" " -f1)" "$p"; done' \ > logs/m0-partitions.sha256 grep -E ' (efs|efs_backup|modem_userdata|persist|modem_a|modem_b)\.img$' \ ~/android/reference/cheetah-partition-backup-20261011/SHA256SUMS | sort -k2 | diff - <(sort -k2 logs/m0-partitions.sha256) @@ -378,7 +379,8 @@ tools/phone-ssh 'cat > /etc/udev/rules.d/60-omamobile-modem-nv-ro.rules' <<'EOF' SUBSYSTEM=="block", ENV{ID_PART_ENTRY_NAME}=="efs|efs_backup|modem_userdata|modem_a|modem_b", RUN+="/usr/bin/blockdev --setro $devnode" EOF tools/phone-ssh 'udevadm control --reload; udevadm trigger -s block -c change; - for p in efs efs_backup modem_userdata modem_a modem_b; do echo $p $(blockdev --getro /dev/disk/by-partlabel/$p); done' + for p in efs efs_backup modem_userdata modem_a modem_b; do + d=$(grep -lx "PARTNAME=$p" /sys/class/block/*/uevent | head -1 | cut -d/ -f5); echo $p $(blockdev --getro /dev/$d); done' # pass: all 1. (persist stays writable for the fingerprint work's own plan; nothing here writes it.) ``` diff --git a/device/cheetah/RADIOS-CAMERA-PLAN.md b/device/cheetah/RADIOS-CAMERA-PLAN.md index 8a02e595c..c27f4b6c1 100644 --- a/device/cheetah/RADIOS-CAMERA-PLAN.md +++ b/device/cheetah/RADIOS-CAMERA-PLAN.md @@ -273,16 +273,18 @@ From the omamobile repo, phone in Arch over USB. # M0.1 the modem's NV and firmware partitions are untouched: checksums match the backup. # Reads only. ~430 MB from UFS, a minute or two. tools/phone-ssh 'for p in efs efs_backup modem_userdata persist modem_a modem_b; do - printf "%s %s.img\n" "$(sha256sum < /dev/disk/by-partlabel/$p | cut -d" " -f1)" "$p"; done' \ + d=$(grep -lx "PARTNAME=$p" /sys/class/block/*/uevent | head -1 | cut -d/ -f5) + printf "%s %s.img\n" "$(sha256sum < /dev/$d | cut -d" " -f1)" "$p"; done' \ > logs/m0-partitions.sha256 grep -E ' (efs|efs_backup|modem_userdata|persist|modem_a|modem_b)\.img$' \ ~/android/reference/cheetah-partition-backup-20261011/SHA256SUMS | sort -k2 | diff - <(sort -k2 logs/m0-partitions.sha256) # pass: no diff for efs, efs_backup, modem_a, modem_b. persist and modem_userdata # may differ if stock Android ran after 2026-10-11; then take a fresh backup -# before M2 (same dd as the original backup, to the laptop). +# before M2 into a new directory on the laptop (tools/nv-backup DIR). # also: nothing mounts them -tools/phone-ssh 'grep -E "sda(1|5|6|7|19|29) " /proc/mounts; ls -l /dev/disk/by-partlabel/ | grep -E " (efs|efs_backup|modem_userdata|persist|modem_a|modem_b) "' -# pass: no mount lines. +tools/phone-ssh 'grep -E "sda(1|5|6|7|19|29) " /proc/mounts + grep -xE "PARTNAME=(efs|efs_backup|modem_userdata|persist|modem_a|modem_b)" /sys/class/block/*/uevent' +# pass: no mount lines. The PARTNAME lines give each partition's sdaN. # M0.2 memory map: the CP regions must not be System RAM in use. tools/phone-ssh 'grep -iE "e8000000|ea400000|f6200000|reserved" /proc/iomem | head -20'