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

[services-openrc] Log configuration failures

Browse Source 
- If services don't exist, or runlevels don't exist,
   log them instead of failing completely silently.
This commit is contained in:
Adriaan de Groot 2018-06-27 09:31:02 -04:00
parent cd640bda9f
commit 8f0db9dc74
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/services-openrc/main.py
View File

@ -23,7 +23,7 @@
import libcalamares
from libcalamares.utils import target_env_call
from libcalamares.utils import target_env_call, warning
from os.path import exists, join
@ -47,12 +47,17 @@ class OpenrcController:
is called with @p state as the command as well.
"""
for svc in self.services[state]:
if exists(self.root + self.initdDir + "/" + svc["name"]):
if exists(self.root + self.runlevelsDir + "/" + svc["runlevel"]):
target_env_call(
["rc-update", state, svc["name"], svc["runlevel"]]
)
for svc in self.services.get(state, []):
service_path = self.root + self.initdDir + "/" + svc["name"]
runlevel_path = self.root + self.runlevelsDir + "/" + svc["runlevel"]
if exists(service_path):
if exists(runlevel_path):
target_env_call(["rc-update", state, svc["name"], svc["runlevel"]])
else:
warning("Target runlevel {} does not exist for {}.".format(svc["runlevel"], svc["name"]))
else:
warning("Target service {} does not exist int {}.".format(svc["name"], self.initDir))
def run(self):
"""Run the controller