Support native SD storage and consolidate fds-flash tooling
Accept native SD cards for internal settings alongside legacy NVMe, reject USB ancestry and ambiguous disks, and preserve read-only boot loading with explicit recovery writes. Require built-in MMC drivers, validate cached kernel configuration, and provide SD-only, SD-first and USB-first EEPROM profiles. Expose typed create and inspect commands through fds-flash, reuse the existing cartridge creation code, and document the optional e2fsprogs package dependency. Extend storage, EEPROM, flashing and hardware-test coverage and advance the wiki reference to the published SD guide. Validation: rootfs checks for CLI/development, boot matrix, internal storage, EEPROM, flash, workstation, emulator, make check and wiki checks passed. The full internal suite passed on an unchanged rerun after one unexplained VM shutdown stall. Standalone init-test was blocked by its unavailable pinned upstream kernel. Physical Pi checks remain pending.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Exercise the packaged machine settings service against disposable virtual NVMe."""
|
||||
"""Exercise packaged machine settings against disposable native SD and NVMe."""
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shlex
|
||||
@@ -41,6 +41,22 @@ def extra(path, node='internal', readonly=False):
|
||||
return ['-drive', f'file={path},if=none,id={node},format=raw' + (',readonly=on' if readonly else ''),
|
||||
'-device', f'nvme,drive={node},serial=FDS-{node.upper()}']
|
||||
|
||||
def sd_extra(path):
|
||||
return ['-drive', f'file={path},if=none,id=internal_sd,format=raw',
|
||||
'-device', 'sdhci-pci,id=sdhci',
|
||||
'-device', 'sd-card,drive=internal_sd']
|
||||
|
||||
def sd_capacity(path):
|
||||
# QEMU SD cards require a power-of-two capacity. Sparse extension and GPT
|
||||
# relocation model flashing the small image onto a larger native card.
|
||||
with path.open('r+b') as output:
|
||||
output.truncate(2 * 1024**3)
|
||||
subprocess.run(['sfdisk', '--relocate', 'gpt-bak-std', str(path)], check=True,
|
||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||
subprocess.run(['sfdisk', '--verify', str(path)], check=True,
|
||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||
return path
|
||||
|
||||
def wait(operation, condition, timeout=60):
|
||||
deadline = time.monotonic() + timeout
|
||||
while True:
|
||||
@@ -128,27 +144,62 @@ with VM(work, 'persistent-settings', empty, extra=[*extra(machine), '-device', c
|
||||
finish(vm)
|
||||
print('PASS: independent reboot loads saved bay/catalog/name settings and retrieves the previous boot record', flush=True)
|
||||
|
||||
sd = sd_capacity(copy_image('native-sd'))
|
||||
original_sd = digest(sd)
|
||||
with VM(work, 'sd-install-settings', empty, extra=sd_extra(sd)) as vm:
|
||||
status = enter(vm)
|
||||
assert status['source'] == 'internal_sd' and status['name'] == 'FP-85', status
|
||||
assert digest(sd) == original_sd, 'Loading SD settings changed the card'
|
||||
assert vm.capture('cat /sys/class/block/mmcblk0/device/type') == 'SD'
|
||||
vm.capture('fds machine export /tmp/sd-machine')
|
||||
vm.capture("printf 'format=1\\nname=\"FP-85 SD\"\\n' >/tmp/sd-machine/machine.toml")
|
||||
vm.capture('fds machine validate /tmp/sd-machine && fds machine install /tmp/sd-machine')
|
||||
assert query(vm, ['machine', 'status'])['name'] == 'FP-85'
|
||||
vm.capture('fds --json boot-profile >/tmp/boot.json && fds machine store sd-boot.json /tmp/boot.json')
|
||||
vm.capture('test -z "$(findmnt -nr -o TARGET | grep /run/fds/machine/internal)"')
|
||||
finish(vm)
|
||||
unchanged_payloads(sd)
|
||||
with VM(work, 'sd-persistent-settings', empty, extra=sd_extra(sd)) as vm:
|
||||
status = enter(vm)
|
||||
assert status['source'] == 'internal_sd' and status['name'] == 'FP-85 SD', status
|
||||
vm.capture('fds machine fetch sd-boot.json /tmp/saved.json')
|
||||
assert json.loads(vm.capture('cat /tmp/saved.json'))['boot_id'] != query(vm, ['boot-profile'])['boot_id']
|
||||
(work / 'sd-persistent-status.json').write_text(json.dumps(status, indent=2) + '\n')
|
||||
finish(vm)
|
||||
|
||||
# SD supplies machine storage while the actual normal SYSTEM remains on USB.
|
||||
with VM(work, 'sd-usb-system', project / 'out/fds-system-cli.img', system_usb=True, extra=sd_extra(sd)) as vm:
|
||||
vm.expect(rb'FDS> ')
|
||||
wait(lambda: vm.capture('test -S /run/fds/control.sock && echo ready || echo pending'), lambda text: text == 'ready')
|
||||
status = query(vm, ['machine', 'status'])
|
||||
assert status['source'] == 'internal_sd' and status['name'] == 'FP-85 SD', status
|
||||
assert vm.capture('findmnt -no FSTYPE /') == 'erofs'
|
||||
finish(vm)
|
||||
print('PASS: native MMC SD recovery, read-only settings load, explicit writes, reboot persistence and normal USB SYSTEM handoff', flush=True)
|
||||
|
||||
# Independent filesystem inspection after real guest writes.
|
||||
part = layout['partitions'][2]
|
||||
settings = work / 'after-guest.ext4'
|
||||
with machine.open('rb') as source, settings.open('wb') as output:
|
||||
source.seek(part['start'] * 512)
|
||||
remaining = part['payload_bytes']
|
||||
while remaining:
|
||||
chunk = source.read(min(remaining, 1024 * 1024))
|
||||
assert chunk
|
||||
output.write(chunk)
|
||||
remaining -= len(chunk)
|
||||
with (work / 'after-guest-fsck.log').open('wb') as log:
|
||||
subprocess.run([runner, 'e2fsck', '-f', '-n', str(settings)], check=True, stdout=log, stderr=subprocess.STDOUT)
|
||||
previous = subprocess.check_output([runner, 'debugfs', '-R', 'cat /config/previous.json', str(settings)], stderr=subprocess.DEVNULL)
|
||||
assert json.loads(previous)['name'] == 'FP-85'
|
||||
for source_disk, name in [(machine, 'nvme'), (sd, 'sd')]:
|
||||
settings = work / (name + '-after-guest.ext4')
|
||||
with source_disk.open('rb') as source, settings.open('wb') as output:
|
||||
source.seek(part['start'] * 512)
|
||||
remaining = part['payload_bytes']
|
||||
while remaining:
|
||||
chunk = source.read(min(remaining, 1024 * 1024))
|
||||
assert chunk
|
||||
output.write(chunk)
|
||||
remaining -= len(chunk)
|
||||
with (work / (name + '-after-guest-fsck.log')).open('wb') as log:
|
||||
subprocess.run([runner, 'e2fsck', '-f', '-n', str(settings)], check=True, stdout=log, stderr=subprocess.STDOUT)
|
||||
previous = subprocess.check_output([runner, 'debugfs', '-R', 'cat /config/previous.json', str(settings)], stderr=subprocess.DEVNULL)
|
||||
assert json.loads(previous)['name'] == 'FP-85'
|
||||
print('PASS: independent ext4 checks after guest SD/NVMe writes and previous-settings retention', flush=True)
|
||||
|
||||
# Both recovery and settings are present on USB, but only recovery may be selected
|
||||
# by its GPT label. USB cannot supply persistent machine settings.
|
||||
with VM(work, 'usb-lookalike', image, system_usb=True) as vm:
|
||||
status = enter(vm)
|
||||
assert status['source'] == 'image_defaults' and 'No complete internal NVMe' in status['error'], status
|
||||
assert status['source'] == 'image_defaults' and 'No complete internal SD/NVMe' in status['error'], status
|
||||
finish(vm)
|
||||
|
||||
# Boot the ordinary CLI SYSTEM with two eligible NVMes already present. Stage0
|
||||
@@ -159,10 +210,19 @@ with VM(work, 'ambiguous-internal', project / 'out/fds-system-cli.img', extra=[*
|
||||
assert vm.capture('stat -c %u:%g:%a /') == '0:0:755'
|
||||
wait(lambda: vm.capture('test -S /run/fds/control.sock && echo ready || echo pending'), lambda text: text == 'ready')
|
||||
status = query(vm, ['machine', 'status'])
|
||||
assert status['source'] == 'image_defaults' and 'Multiple internal NVMe' in status['error'], status
|
||||
assert status['source'] == 'image_defaults' and 'Multiple internal SD/NVMe' in status['error'], status
|
||||
finish(vm)
|
||||
print('PASS: USB settings spoof and two eligible NVMes fall back with explicit diagnostics', flush=True)
|
||||
|
||||
with VM(work, 'ambiguous-sd-nvme', project / 'out/fds-system-cli.img',
|
||||
extra=[*sd_extra(sd), *extra(image, 'old_nvme', True)]) as vm:
|
||||
vm.expect(rb'FDS> ')
|
||||
wait(lambda: vm.capture('test -S /run/fds/control.sock && echo ready || echo pending'), lambda text: text == 'ready')
|
||||
status = query(vm, ['machine', 'status'])
|
||||
assert status['source'] == 'image_defaults' and 'Multiple internal SD/NVMe' in status['error'], status
|
||||
finish(vm)
|
||||
print('PASS: concurrent eligible SD and NVMe are rejected instead of silently selecting settings', flush=True)
|
||||
|
||||
# Corrupt configuration and an unclean ext4 are distinct failure cases. Build
|
||||
# fixtures by changing only the settings partition, retaining the packaged OS.
|
||||
def altered(name, commands):
|
||||
@@ -191,8 +251,16 @@ for name, disk, expected in fixtures:
|
||||
assert digest(disk) == before, 'Failure path wrote internal storage'
|
||||
finish(vm)
|
||||
print('PASS: invalid JSON, writable/symlink settings and unclean ext4 preserve bytes and leave the recovery console usable', flush=True)
|
||||
dirty_sd = sd_capacity(altered('unclean-sd', ['set_super_value state 0']))
|
||||
before = digest(dirty_sd)
|
||||
with VM(work, 'unclean-sd', empty, extra=sd_extra(dirty_sd)) as vm:
|
||||
status = enter(vm)
|
||||
assert status['source'] == 'image_defaults' and 'unclean' in status['error'], status
|
||||
assert digest(dirty_sd) == before, 'Unclean SD was modified during fallback'
|
||||
finish(vm)
|
||||
print('PASS: unclean SD falls back without journal replay or persistent writes', flush=True)
|
||||
link = project / 'out/m12-internal-latest.next'
|
||||
link.symlink_to(work.name)
|
||||
link.replace(project / 'out/m12-internal-latest')
|
||||
print(f'PASS: internal storage software acceptance: {work}', flush=True)
|
||||
print('SKIP: Pi EEPROM/NVMe boot, real bay calibration, power-loss and flash durability')
|
||||
print('SKIP: physical Pi EEPROM/SD/NVMe boot, maintenance USB boot, real bay calibration, power-loss and flash durability')
|
||||
|
||||
Reference in New Issue
Block a user