2 files changed, 40 insertions, 7 deletions
diff --git a/src/modules/services-openrc/main.py b/src/modules/services-openrc/main.py
index c3e14b481..9506c44a2 100644
--- a/src/modules/services-openrc/main.py
+++ b/src/modules/services-openrc/main.py
@@ -35,15 +35,22 @@ class OpenrcController:
     """
 
     def __init__(self):
+        #desktop_key = libcalamares.globalstorage.value(GS::DESKTOP_KEY)
+        desktop_key      = libcalamares.globalstorage.value('default-desktop') # TODO:
+        cfg              = libcalamares.job.configuration
+        cfg['services'] += cfg.get('services' , []) + cfg.get(desktop_key + '-services' , [])
+
         self.root = libcalamares.globalstorage.value('rootMountPoint')
 
         # Translate the entries in the config to the actions passed to rc-config
-        self.services = dict()
-        self.services["add"] = libcalamares.job.configuration.get('services', [])
-        self.services["del"] = libcalamares.job.configuration.get('disable', [])
 
-        self.initdDir = libcalamares.job.configuration['initdDir']
-        self.runlevelsDir = libcalamares.job.configuration['runlevelsDir']
+        self.services    = dict()
+
+        self.services["add"] = cfg.get('services', [])
+        self.services["del"] = cfg.get('disable', [])
+
+        self.initdDir = cfg['initdDir']
+        self.runlevelsDir = cfg['runlevelsDir']
 
     def update(self, state):
         """
@@ -99,6 +106,12 @@ class OpenrcController:
                 return r
 
 def run():
+    #init_key = libcalamares.globalstorage.value(GS::INITSYSTEM_KEY)
+    init_key = libcalamares.globalstorage.value('default-initsystem') # TODO:
+
+    if init_key != 'openrc': return None
+
+
     """
     Setup services
     """
diff --git a/src/modules/services-openrc/services-openrc.conf b/src/modules/services-openrc/services-openrc.conf
index b8255b21a..e631b8c99 100644
--- a/src/modules/services-openrc/services-openrc.conf
+++ b/src/modules/services-openrc/services-openrc.conf
@@ -41,6 +41,26 @@ runlevelsDir: /etc/runlevels
 #     - name: foo3
 #       runlevel: default
 #     - foo4
-services: []
-disable: []
+services:
+  - name: "alsasound"
+    mandatory: false
+  - name: "dbus"
+    mandatory: true
+  - name: "elogind"
+    mandatory: false
+  - name: "haveged"
+    mandatory: false
+  - name: "NetworkManager"
+    mandatory: false
 
+lxde-services:
+  - name: "lxdm"
+    mandatory: true
+
+mate-services:
+  - name: "lightdm"
+    mandatory: true
+
+disable:
+  - name: "pacman-init"
+    mandatory: false