fix backtrace in s390 reipl support due to missing anaconda.id.fsset (#509877)

Replaces previous post with fixed patch.

Assuming anaconda.id.bootloader.device is always a disk device
(not a partition) and it always contains the device /boot and hence the
zipl bootloader is located on, this fixes the back trace.

1 files changed, 3 insertions, 27 deletions

diff --git a/iutil.py b/iutil.py
index 864922415..49509e993 100644
--- a/iutil.py
+++ b/iutil.py
@@ -764,13 +764,7 @@ def reIPLonCCW(iplsubdev, reipl_path):
     device = "<unknown>"
 
     try:
-        iplbits = re.split ('([0-9]+)', iplsubdev)
-        if len (iplbits) != 3:
-            message = _("Error: %s splits into %s but not like we expect" % (iplsubdev,iplbits,))
-            log.warning(message)
-            raise Exception (message)
-
-        device = os.readlink("/sys/block/" + iplbits[0] + "/device").split('/')[-1]
+        device = os.readlink("/sys/block/" + iplsubdev + "/device").split('/')[-1]
 
         writeReiplMethod(reipl_path, 'ccw')
 
@@ -816,13 +810,7 @@ def reIPLonFCP(iplsubdev, reipl_path):
     fcpvalue = { "device": "<unknown>", "wwpn": "<unknown>", "lun": "<unknown>" }
 
     try:
-        iplbits = re.split ('([0-9]+)', iplsubdev)
-        if len (iplbits) != 3:
-            message = _("Error: %s splits into %s but not like we expect" % (iplsubdev,iplbits,))
-            log.warning(message)
-            raise Exception (message)
-
-        syspath = "/sys/block/" + iplbits[0] + "/device"
+        syspath = "/sys/block/" + iplsubdev + "/device"
 
         fcpprops = [ ("hba_id", "device"), ("wwpn", "wwpn"), ("fcp_lun", "lun") ]
 
@@ -883,19 +871,7 @@ def reIPL(anaconda, loader_pid):
 
     reipl_path = "/sys/firmware/reipl"
 
-    iplfs = anaconda.id.fsset.getEntryByMountPoint("/boot")
-    if iplfs is None:
-        iplfs = anaconda.id.fsset.getEntryByMountPoint("/")
-
-    if iplfs is None:
-        message = _("Could not get information for mount point /boot or /")
-        log.warning(message)
-        return (message, instruction)
-
-    try:
-        ipldev = iplfs.device.device
-    except:
-        ipldev = None
+    ipldev = anaconda.id.bootloader.device
 
     if ipldev is None:
         message = _("Error determining mount point type")