[rhel7-branch 19/29] Skip nvram update on ppc64 image/dir installations (#1136486)

bcl installerbot-noreply at redhat.com
Wed Jun 3 00:36:51 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

We don't want to modify the host's nvram.

Resolves: rhbz#1136486
(cherry picked from commit 6811827e133d9bf75dbac4f861d08d76d228e4c3)

Related: rhbz#1196721
---
 pyanaconda/bootloader.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 8c4d206..0f31cc4 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1958,6 +1958,9 @@ def install(self, args=None):
         super(IPSeriesYaboot, self).install()
 
     def updatePowerPCBootList(self):
+        if flags.imageInstall or flags.dirInstall:
+            log.info("Skipping updatePowerPCBootList for image/directory install.")
+            return
 
         log.debug("updatePowerPCBootList: self.stage1_device.path = %s", self.stage1_device.path)
 
@@ -2018,6 +2021,9 @@ def install(self, args=None):
 
     # This will update the PowerPC's (ppc) bios boot devive order list
     def updateNVRAMBootList(self):
+        if flags.imageInstall or flags.dirInstall:
+            log.info("Skipping updateNVRAMBootList for image/directory install.")
+            return
 
         log.debug("updateNVRAMBootList: self.stage1_device.path = %s", self.stage1_device.path)
 


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/1fe04b8fa2f419695367ba303e82b4d14531cc40


More information about the anaconda-patches mailing list