From 8683d46ab6cd3cae9cb2afc29d3d6e3bf6f80ce6 Mon Sep 17 00:00:00 2001 From: Mike Degatano Date: Mon, 21 Feb 2022 14:31:15 -0500 Subject: [PATCH] Add dbus support to plugin-dns (#3459) --- supervisor/docker/addon.py | 4 ++-- supervisor/docker/const.py | 4 ++++ supervisor/docker/dns.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/supervisor/docker/addon.py b/supervisor/docker/addon.py index 6e03ea468..78eee8e03 100644 --- a/supervisor/docker/addon.py +++ b/supervisor/docker/addon.py @@ -45,7 +45,7 @@ from ..hardware.data import Device from ..jobs.decorator import Job, JobCondition from ..resolution.const import ContextType, IssueType, SuggestionType from ..utils import process_lock -from .const import Capabilities +from .const import DBUS_PATH, DBUS_VOLUME, Capabilities from .interface import DockerInterface if TYPE_CHECKING: @@ -409,7 +409,7 @@ class DockerAddon(DockerInterface): # Host D-Bus system if self.addon.host_dbus: - volumes.update({"/run/dbus": {"bind": "/run/dbus", "mode": "ro"}}) + volumes.update({DBUS_PATH: DBUS_VOLUME}) # Configuration Audio if self.addon.with_audio: diff --git a/supervisor/docker/const.py b/supervisor/docker/const.py index 857aa97fc..e8ead99fc 100644 --- a/supervisor/docker/const.py +++ b/supervisor/docker/const.py @@ -15,3 +15,7 @@ class Capabilities(str, Enum): SYS_RAWIO = "SYS_RAWIO" SYS_RESOURCE = "SYS_RESOURCE" SYS_TIME = "SYS_TIME" + + +DBUS_PATH = "/run/dbus" +DBUS_VOLUME = {"bind": DBUS_PATH, "mode": "ro"} diff --git a/supervisor/docker/dns.py b/supervisor/docker/dns.py index 12d996856..ccd5a85da 100644 --- a/supervisor/docker/dns.py +++ b/supervisor/docker/dns.py @@ -3,6 +3,7 @@ import logging from ..const import ENV_TIME from ..coresys import CoreSysAttributes +from .const import DBUS_PATH, DBUS_VOLUME from .interface import DockerInterface _LOGGER: logging.Logger = logging.getLogger(__name__) @@ -47,7 +48,8 @@ class DockerDNS(DockerInterface, CoreSysAttributes): security_opt=self.security_opt, environment={ENV_TIME: self.sys_timezone}, volumes={ - str(self.sys_config.path_extern_dns): {"bind": "/config", "mode": "rw"} + str(self.sys_config.path_extern_dns): {"bind": "/config", "mode": "rw"}, + DBUS_PATH: DBUS_VOLUME, }, )