Commit 7f0f98d
committed
Merge remote-tracking branch 'origin/pr/834'
* origin/pr/834:
Fix bug in storage/__init__.py dropping "False" config values
Pull request description:
The _sanitize_config function drops "False" values from the config, resulting in properties such as rw="False" disappearing. As a consequence, the default value of "True" gets reassigned to them. Similar to #829, but does not have any practical consequences I can think of beyond having the correct/expected behavior for the "False" values.
To reproduce:
```sh
[user@dom0 ~]$ sudo systemctl stop qubesd
[user@dom0 ~]$ sudo nano /var/lib/qubes/qubes.xml # Set rw="False" for any domU volume
[user@dom0 ~]$ sudo systemctl start qubesd
[user@dom0 ~]$ # At this stage, rw="False" is still present
[user@dom0 ~]$ # Now, make any edit to the domU - the simplest example is to change the vCPU count, and then apply it
[user@dom0 ~]$ # Then, rw="False" will fully disappear in qubes.xml
[user@dom0 ~]$ sudo systemctl restart qubesd
[user@dom0 ~]$ # Now, make another edit to the domU to trigger a fresh save
[user@dom0 ~]$ # Now rw="True" appears in qubes.xml
```1 file changed
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1119 | 1119 | | |
1120 | 1120 | | |
1121 | 1121 | | |
| 1122 | + | |
| 1123 | + | |
1122 | 1124 | | |
1123 | 1125 | | |
1124 | 1126 | | |
| |||
0 commit comments