Add switch to ignore kernel cmdline options

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

diff --git a/src/bricklayer b/src/bricklayer
index e5ac1e788961133d45661ecba8832185bea5ccce..ef04347a1fc25ff484b2d264b832b749d8f2fa93 100644 (file)
--- a/src/bricklayer
+++ b/src/bricklayer
@@ -54,6 +54,8 @@ class Cli(object):
                        help=_("A disk image file or device which will be used"))
                parser.add_argument("--serial", action="store_true",
                        help=_("Create an image using a serial console"))
+               parser.add_argument("--ignore-kernel-cmdline", action="store_true",
+                       help=_("Ignores parsing the configuration from the kernel commandline"))
 
                # Parse arguments
                return parser.parse_args()

diff --git a/src/python/__init__.py b/src/python/__init__.py
index ba7f59c7d5e658e8130a3445c527969597da1258..84d8908106f3998e76502f220def1940112ba2a7 100644 (file)
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -49,7 +49,7 @@ class Bricklayer(object):
                Bricklayer's base class
        """
        def __init__(self, arch, pakfire_conf=None, first_install=False, debug=False,
-                       unattended=False, disks=[], serial=False):
+                       unattended=False, disks=[], serial=False, ignore_kernel_cmdline=False):
                self.arch = arch
                self.pakfire_conf = pakfire_conf
                self.first_install = first_install
@@ -85,7 +85,8 @@ class Bricklayer(object):
                }
 
                # Parse the kernel command line
-               self._read_cmdline()
+               if ignore_kernel_cmdline:
+                       self._read_cmdline()
 
                # Read OS information
                self.os = self._read_os_release()