jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-16 05:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix swapped volume/bind variables in Journald volume support (#2764)

Browse Source
This commit is contained in:
Franck Nijhof 2021-03-29 09:46:22 +02:00 committed by GitHub
parent 2be1529cb8
commit 65386b753f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
supervisor/docker/addon.py
View File

@ -418,14 +418,14 @@ class DockerAddon(DockerInterface):
# System Journal access # System Journal access
if self.addon.with_journald: if self.addon.with_journald:
# Systemd uses volatile by default, unless persistent location exists. # Systemd uses volatile by default, unless persistent location exists.
bind = SYSTEMD_JOURNAL_VOLATILE journal = SYSTEMD_JOURNAL_VOLATILE
if SYSTEMD_JOURNAL_PERSISTENT.exists(): if SYSTEMD_JOURNAL_PERSISTENT.exists():
bind = SYSTEMD_JOURNAL_PERSISTENT journal = SYSTEMD_JOURNAL_PERSISTENT
volumes.update( volumes.update(
{ {
str(SYSTEMD_JOURNAL_PERSISTENT): { str(journal): {
"bind": str(bind), "bind": str(SYSTEMD_JOURNAL_PERSISTENT),
"mode": "ro", "mode": "ro",
} }
} }

8
tests/docker/test_addon.py
View File

@ -105,11 +105,11 @@ def test_journald_addon_volatile(coresys: CoreSys, addonsdata_system: Dict[str,
) )
volumes = docker_addon.volumes volumes = docker_addon.volumes
assert str(SYSTEMD_JOURNAL_PERSISTENT) in volumes assert str(SYSTEMD_JOURNAL_VOLATILE) in volumes
assert volumes.get(str(SYSTEMD_JOURNAL_PERSISTENT)).get("bind") == str( assert volumes.get(str(SYSTEMD_JOURNAL_VOLATILE)).get("bind") == str(
SYSTEMD_JOURNAL_VOLATILE SYSTEMD_JOURNAL_PERSISTENT
) )
assert volumes.get(str(SYSTEMD_JOURNAL_PERSISTENT)).get("mode") == "ro" assert volumes.get(str(SYSTEMD_JOURNAL_VOLATILE)).get("mode") == "ro"
def test_journald_addon_persistent( def test_journald_addon_persistent(