ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-03-22 12:05:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch config.txt backend to return array configs correctly

Browse Source 
Previously, getBootConfig() of the config.txt backend was omitting
array configurations such as gpio settings, thus resulting in the SV
mistakenly assuming that boot config had not been applied, since gpio
would not be in current config.txt config but would be in target config.
This resulted in SV entering an infinite loop of attempting to apply the
gpio config when it wasn't necessary.

Change-type: patch
Signed-off-by: Christina Ying Wang <christina@balena.io>
This commit is contained in:
Christina Ying Wang 2024-02-16 18:12:33 -08:00
parent 5adf727cb5
commit e22253ce6e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/backends/config-txt.ts
View File

@ -157,6 +157,9 @@ export class ConfigTxt extends ConfigBackend {
// Otherwise push the new value to the array
const arrayConf = conf[key] == null ? [] : conf[key]!;
arrayConf.push(value);
if (conf[key] == null) {
conf[key] = arrayConf;
}
}
}
continue;

3
test/integration/config/config-txt.spec.ts
View File

@ -17,6 +17,8 @@ describe('config/config-txt', () => {
dtoverlay=ads7846
enable_uart=1
avoid_warnings=1
gpio=8=pd
gpio=17=op,dh
gpu_mem=16
hdmi_force_hotplug:1=1
dtoverlay=lirc-rpi,gpio_out_pin=17,gpio_in_pin=13
@ -34,6 +36,7 @@ describe('config/config-txt', () => {
],
enable_uart: '1',
avoid_warnings: '1',
gpio: ['8=pd', '17=op,dh'],
gpu_mem: '16',
initramfs: 'initramf.gz 0x00800000',
'hdmi_force_hotplug:1': '1',