plymouthcfg: Use simpledrm by default to show splash screen

Signed-off-by: Vasiliy Stelmachenok <ventureo@cachyos.org>

Author: ventureoo

src/modules/plymouthcfg/main.py

@@ -12,9 +12,11 @@
 #   Calamares is Free Software: see the License-Identifier above.
 #
 
+import os
+import fileinput
 import libcalamares
 
-from libcalamares.utils import debug, target_env_call
+from libcalamares.utils import debug, warning, target_env_call
 
 import gettext
 _ = gettext.translation("calamares-python",
@@ -50,11 +52,28 @@ def setTheme(self):
         plymouth_theme = libcalamares.job.configuration["plymouth_theme"]
         target_env_call(["plymouth-set-default-theme",  plymouth_theme])
 
+    def setUseSimpledrm(self):
+        conf_path = os.path.join(self.__root, "etc", "plymouth", "plymouthd.conf")
+
+        try:
+            with fileinput.input(conf_path, inplace=True) as config:
+                for line in config:
+                    if line.startswith("#[Daemon]") or line.startswith("[Daemon]"):
+                        line = line.lstrip("#")
+                        line = line + "UseSimpledrm=1\n"
+
+                    print(line, end='')
+        except Exception as e:
+            warning("Failed to set UseSimpledrm=1: {!s}".format(e))
+
     def run(self):
         if detect_plymouth():
             if (("plymouth_theme" in libcalamares.job.configuration) and
                (libcalamares.job.configuration["plymouth_theme"] is not None)):
                 self.setTheme()
+
+            if libcalamares.job.configuration.get("plymouth_simpledrm", False):
+                self.setUseSimpledrm()
         return None
 
 

src/modules/plymouthcfg/plymouthcfg.conf

@@ -3,20 +3,20 @@
 #
 # Plymouth Configuration Module
 #
-# This module can be used to setup the default plymouth theme to 
+# This module can be used to setup the default plymouth theme to
 # be used with your distribution
 #
-# You should only use this module if the plymouth package is installed 
-# on the build configurations of your distribution & the plymouth 
+# You should only use this module if the plymouth package is installed
+# on the build configurations of your distribution & the plymouth
 # theme you want to configure is installed as well. If the unpacked
 # filesystem configures a plymouth theme already, there is no need
 # to change it here.
 ---
 
 
-# Leave this commented if you want to use the default theme 
-# shipped with your distribution configurations. Make sure that 
-# the theme exists in the themes directory of plymouth path. 
+# Leave this commented if you want to use the default theme
+# shipped with your distribution configurations. Make sure that
+# the theme exists in the themes directory of plymouth path.
 # Debian / Ubuntu comes with themes "joy", "script", "softwaves",
 # possibly others. Look in /usr/share/plymouth/themes for more.
 #
@@ -26,6 +26,5 @@
 
 plymouth_theme: cachyos-bootanimation
 
-
-
-
+# Use simpledrm driver to show splash screen
+plymouth_simpledrm: true

src/modules/plymouthcfg/plymouthcfg.schema.yaml

@@ -7,3 +7,4 @@ additionalProperties: false
 type: object
 properties:
     plymouth_theme: { type: string }
+    plymouth_simpledrm: { type: boolean }