summaryrefslogtreecommitdiff
path: root/src/conf_mode/dhcp_server.py
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2020-08-31 11:23:06 -0500
committerGitHub <noreply@github.com>2020-08-31 11:23:06 -0500
commit621fcb078abb53888e995a007fb9ea31e95e34ab (patch)
treea4dda1096a267fed41ac90121ab6233e5b8b7d39 /src/conf_mode/dhcp_server.py
parentbd076f694a763991a0b0d3a7bb0fa5d194d56d7c (diff)
parentad69fb36201ee0930b76d80f0869284e26846991 (diff)
downloadvyos-1x-621fcb078abb53888e995a007fb9ea31e95e34ab.tar.gz
vyos-1x-621fcb078abb53888e995a007fb9ea31e95e34ab.zip
Merge pull request #535 from jestabro/vyos-configd
configd: T2582: vyos config script daemon configd: T2582: add scripts to include list for daemon configd: T2808: add smoketest to ensure script consistency with daemon configd: T2582: add utility to safely add/remove items from include file configd: T2582: add shim var to node.def configd: T2582: inject shim env variable into configsession configd: T2582: add shim as config daemon client configd: T2582: add mkjson for use by shim configd: T2582: add config daemon and supporting files
Diffstat (limited to 'src/conf_mode/dhcp_server.py')
-rwxr-xr-xsrc/conf_mode/dhcp_server.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index 0eaa14c5b..fd4e2ec61 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -126,9 +126,12 @@ def dhcp_static_route(static_subnet, static_router):
return string
-def get_config():
+def get_config(config=None):
dhcp = default_config_data
- conf = Config()
+ if config:
+ conf = config
+ else:
+ conf = Config()
if not conf.exists('service dhcp-server'):
return None
else: