bzuccaro/Mark-VIII
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(reliability): probe section existence via uci show, not an option key

Browse Source
This commit is contained in:
bzuccaro
2026-08-22 18:59:57 -06:00
parent 1133068a09
commit 55d4beb9d4
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
payload/user/remote_access/pager-webui/mk8_guard.py
+4 -3
View File
@@ -34,9 +34,10 @@ def _pool_size():
def _ensure_pineapd_section(): def _ensure_pineapd_section():
"""Stock daemon rewrites and profile restores can drop the whole """Stock daemon rewrites and profile restores can drop the whole
`config pineapd` section; every @pineapd[0] option write fails with `config pineapd` section; every @pineapd[0] option write fails with
'Invalid argument' until it exists again.""" 'Invalid argument' until it exists again. Probes SECTION existence
rc, out, err = device_run(['uci', '-q', 'get', (`uci -q show @pineapd[0]`) — never an option, which may legitimately
'pineapd.@pineapd[0].logrecon']) be absent from a rewritten section."""
rc, out, err = device_run(['uci', '-q', 'show', 'pineapd.@pineapd[0]'])
if rc == 0: if rc == 0:
return False return False
device_run(['uci', 'add', 'pineapd', 'pineapd']) device_run(['uci', 'add', 'pineapd', 'pineapd'])
payload/user/remote_access/pager-webui/server.py
+7 -3
View File
@@ -4643,13 +4643,17 @@ PINEAPD_RUNTIME_UCI.add('pineapd.@ssidpool[0].disable')
def _apply_uci_wanted(wanted): def _apply_uci_wanted(wanted):
"""Idempotently apply a wanted UCI key/value set. Returns changed keys.""" """Idempotently apply a wanted UCI key/value set. Returns changed keys.
A failed `uci set` (e.g. missing anchor section) is NOT reported as
applied."""
actions = [] actions = []
for key, value in wanted.items(): for key, value in wanted.items():
rc, out, err = device_run(['uci', 'get', key]) rc, out, err = device_run(['uci', 'get', key])
if rc != 0 or out.strip() != value: if rc != 0 or out.strip() != value:
device_run(['uci', 'set', '%s=%s' % (key, value)]) src_rc, s_out, s_err = device_run(
actions.append(key) ['uci', 'set', '%s=%s' % (key, value)])
if src_rc == 0:
actions.append(key)
return actions return actions
tests/test_mk8_guard.py
+1 -2
View File
@@ -109,8 +109,7 @@ class SectionRecreateTest(unittest.TestCase):
def fake_run(args, timeout=20, input_data=None): def fake_run(args, timeout=20, input_data=None):
a = list(args) a = list(args)
self.calls.append(a) self.calls.append(a)
if a[:4] == ['uci', '-q', 'get', if a[:3] == ['uci', '-q', 'show']:
'pineapd.@pineapd[0].logrecon']:
return (1, '', '') # section missing return (1, '', '') # section missing
if a[:2] == ['uci', 'get']: if a[:2] == ['uci', 'get']:
got = self.uci.get(a[2]) got = self.uci.get(a[2])