From 33da19adb30590f64f8c83e50d4cab9db07d5f6f Mon Sep 17 00:00:00 2001 From: Gene Czarcinski Date: Wed, 17 Sep 2014 15:19:14 -0400 Subject: [PATCH] Add the --nombr bootloader option in pykickstart Besides being a boot-time option, add the --nombr option for kickstart's bootloader command. If specified, then grub2 will be installed but the MBR will not be updated. Related: rhbz#886502 --- pykickstart/commands/bootloader.py | 10 ++++++++-- tests/commands/bootloader.py | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pykickstart/commands/bootloader.py b/pykickstart/commands/bootloader.py index 3925a81..28563f2 100644 --- a/pykickstart/commands/bootloader.py +++ b/pykickstart/commands/bootloader.py @@ -352,17 +352,23 @@ class F21_Bootloader(F19_Bootloader): F19_Bootloader.__init__(self, writePriority, *args, **kwargs) self.disabled = kwargs.get("disabled", False) + self.nombr = kwargs.get("nombr", False) def _getArgsAsStr(self): if self.disabled: return " --disabled" - else: - return F19_Bootloader._getArgsAsStr(self) + + ret = F19_Bootloader._getArgsAsStr(self) + if self.nombr: + ret += " --nombr" + return ret def _getParser(self): op = F19_Bootloader._getParser(self) op.add_option("--disabled", dest="disabled", action="store_true", default=False) + op.add_option("--nombr", dest="nombr", action="store_true", + default=False) return op class RHEL7_Bootloader(F19_Bootloader): diff --git a/tests/commands/bootloader.py b/tests/commands/bootloader.py index 88d0819..dcfda37 100644 --- a/tests/commands/bootloader.py +++ b/tests/commands/bootloader.py @@ -178,6 +178,7 @@ class RHEL7_TestCase(F19_TestCase): self.assert_parse("bootloader --disabled", "bootloader --disabled\n") self.assert_parse("bootloader --location=mbr --disabled", "bootloader --disabled\n") + self.assert_parse("bootloader --location=mbr --nombr", "bootloader --location=mbr --nombr\n") if __name__ == "__main__": -- 2.11.4.GIT