bootloaders: Set kernel command line options

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/python/__init__.py b/src/python/__init__.py
index 6c2f78a360621ffbba5c0300137f6ac6b66de8ca..f0b71d9e1b17bbad167f9ea2d8157d82bea30ca4 100644 (file)
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -81,6 +81,9 @@ class Bricklayer(object):
                        # Default timezone
                        "timezone" : "UTC",
 
+                       # Kernel Commandline
+                       "kernel-cmdline" : "quiet splash",
+
                        # Serial Console
                        "serial-console"          : False,
                        "serial-console-device"   : "ttyS0",

diff --git a/src/python/bootloaders.py b/src/python/bootloaders.py
index 3836f981a54a0ba9a9d189968fd5ff6d6b0fd35d..6d2405e7dca7f6e5d2be8e1effb7e92914fa8b4e 100644 (file)
--- a/src/python/bootloaders.py
+++ b/src/python/bootloaders.py
@@ -152,6 +152,11 @@ class Grub(Bootloader):
                else:
                        conf["GRUB_TERMINAL_OUTPUT"] = "\"console\""
 
+               # Set the kernel commandline
+               kernel_cmdline = self.bricklayer.settings.get("kernel-cmdline")
+               if kernel_cmdline:
+                       conf["GRUB_CMDLINE_LINUX"] = "\"%s\"" % kernel_cmdline
+
                # Write everything to file
                with self.bricklayer.open("/etc/default/grub", "w") as f:
                        for key, val in conf.items():