napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[services-systemd] Be more resilient in the config

Browse Source 
- If a key is not given, use [] instead of crashing.
This commit is contained in:
Adriaan de Groot 2018-06-27 07:14:18 -04:00
parent c9c777b055
commit 59b07cc720
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/services-systemd/main.py
View File

@ -64,23 +64,23 @@ def run():
# that support that, see: # that support that, see:
# http://0pointer.de/blog/projects/changing-roots.html # http://0pointer.de/blog/projects/changing-roots.html
r = systemctl(cfg["services"], "enable", ".service") r = systemctl(cfg.get("services", []), "enable", ".service")
if r is not None: if r is not None:
return r return r
r = systemctl(cfg["targets"], "enable", ".target") r = systemctl(cfg.get("targets", []), "enable", ".target")
if r is not None: if r is not None:
return r return r
r = systemctl(cfg["disable"], "disable", ".service") r = systemctl(cfg.get("disable", []), "disable", ".service")
if r is not None: if r is not None:
return r return r
r = systemctl(cfg["disable-targets"], "disable", ".target") r = systemctl(cfg.get("disable-targets", []), "disable", ".target")
if r is not None: if r is not None:
return r return r
r = systemctl(cfg["mask"], "mask", "") r = systemctl(cfg.get("mask", []), "mask", "")
if r is not None: if r is not None:
return r return r