New: [rhinstaller/anaconda/pulls/145 rhel7-branch] Fix adding 'boot=' option in FIPS mode

[dashea]

'boot=' option shouldn't be added when there is no separate /boot
partition.

Resolves: rhbz#1190146

Signed-off-by: Vojtech Trefny

[rhel7-branch 1/1] Fix adding 'boot=' option in FIPS mode

[dashea]

From: Vojtech Trefny

'boot=' option shouldn't be added when there is no separate /boot
partition.

Resolves: rhbz#1190146

Signed-off-by: Vojtech Trefny 
---
 pyanaconda/bootloader.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 999c29d..bc60c15 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -800,7 +800,8 @@ def set_boot_args(self, *args, **kwargs):
         #
         # FIPS
         #
-        if flags.cmdline.get("fips") == "1":
+        boot_device = storage.mountpoints.get("/boot")
+        if flags.cmdline.get("fips") == "1" and boot_device:
             self.boot_args.add("boot=%s" % self.stage2_device.fstabSpec)

#

[rhinstaller/anaconda/pulls/145 rhel7-branch] Fix adding 'boot=' option in FIPS mode

[dashea]

Added label: rhel7-branch.

[rhinstaller/anaconda/pulls/145 rhel7-branch] Fix adding 'boot=' option in FIPS mode

[dashea]

Looks good to me.

[rhinstaller/anaconda/pulls/145 rhel7-branch] Fix adding 'boot=' option in FIPS mode

[dashea]

Added label: ACK.

[rhinstaller/anaconda/pulls/145 rhel7-branch] Fix adding 'boot=' option in FIPS mode

[dashea]

Pushed.

[rhinstaller/anaconda/pulls/145 rhel7-branch] Fix adding 'boot=' option in FIPS mode

[dashea]

Closed.