[rhel7-branch 2/2] Remove the reference to "anaconda" in reIPL. (#1052167)

Samantha N. Bueno sbueno+anaconda at redhat.com
Mon Jan 13 16:07:26 UTC 2014


That doesn't get passed as a parameter anymore, which tells me the True branch
of the if isn't being called.  And then, the string handling with translations
there is just awful so it's gone too.

Resolves: rhbz#1052167

Cherry-picked from commit bf8678e3d3076b5ca983849f15eeb3ef8ac1e958.
---
 pyanaconda/bootloader.py |  4 +---
 pyanaconda/iutil.py      | 18 ------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index cbf03b6..58e1f7c 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2105,9 +2105,7 @@ class ZIPL(BootLoader):
             raise BootLoaderError("could not find IPL device")
 
         # do the reipl
-        message = iutil.reIPL(self.stage1_name)
-        log.info(message)
-
+        iutil.reIPL(self.stage1_name)
 
 class UBOOT(BootLoader):
     name = "UBOOT"
diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py
index 197986b..8c76c20 100644
--- a/pyanaconda/iutil.py
+++ b/pyanaconda/iutil.py
@@ -318,27 +318,9 @@ def reIPL(ipldev):
                  ipldev, e)
 
     if rc:
-        devstring = None
-
-        for disk in anaconda.storage.disks:
-            if disk.name == ipldev:
-                devstring = disk.description
-                break
-
-        if devstring is None:
-            devstring = _("the device containing /boot")
-
-        message = _("After shutdown, please perform a manual IPL from %s "
-                    "to continue installation." % devstring)
-
         log.info("reIPL configuration failed")
-        #os.kill(os.getppid(), signal.SIGUSR1)
     else:
-        message = None
         log.info("reIPL configuration successful")
-        #os.kill(os.getppid(), signal.SIGUSR2)
-
-    return message
 
 def resetRpmDb():
     for rpmfile in glob.glob("%s/var/lib/rpm/__db.*" % ROOT_PATH):
-- 
1.8.3.1



More information about the anaconda-patches mailing list