Attachment 614941 Details for Bug 857940 – proposed patch to fix s390 bootloader setup

[patch] proposed patch to fix s390 bootloader setup

anaconda-s390-boot.0.patch (text/plain), 1.90 KB, created by David Lehman on 2012-09-20 14:15:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lehman

Created: 2012-09-20 14:15:07 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
>index b0aff48..bc5ea91 100644
>--- a/pyanaconda/bootloader.py
>+++ b/pyanaconda/bootloader.py
>@@ -1948,6 +1948,10 @@ class ZIPL(BootLoader):
>     image_label_attr = "short_label"
>     preserve_args = ["cio_ignore"]
> 
>+    def __init__(self, platform=None):
>+        super(ZIPL, self).__init__(platform=platform)
>+        self.stage1_name = None
>+
>     #
>     # configuration
>     #
>@@ -1993,7 +1997,6 @@ class ZIPL(BootLoader):
>     #
> 
>     def install(self):
>-        # DWL FIXME: resolve the boot device to a StorageDevice from storage
>         buf = iutil.execWithCapture("zipl", [],
>                                     stderr="/dev/tty5",
>                                     root=ROOT_PATH,
>@@ -2005,12 +2008,10 @@ class ZIPL(BootLoader):
>                 #     Preparing boot device: dasdl.
>                 # We want to extract the device name and pass that.
>                 name = re.sub(".+?: ", "", line)
>-                name = re.sub("(\s$.+$)?\.$", "", name)
>-                device = self.storage.devicetree.getDeviceByName(name)
>-                if not device:
>-                    raise BootLoaderError("could not find IPL device")
>+                self.stage1_name = re.sub("(\s$.+$)?\.$", "", name)
> 
>-                self.stage1_device = device
>+        if not self.stage1_name:
>+            raise BootLoaderError("could not find IPL device")
> 
> class SILO(YabootSILOBase):
>     name = "SILO"
>diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py
>index 9d3b433..0dde11b 100644
>--- a/pyanaconda/iutil.py
>+++ b/pyanaconda/iutil.py
>@@ -862,7 +862,7 @@ def numeric_type(num):
> 
> def reIPL(anaconda, loader_pid):
>     try:
>-        ipldev = anaconda.bootloader.stage1_device.name
>+        ipldev = anaconda..storage.bootloader.stage1_name
>     except AttributeError:
>         message = _("Error determining boot device's disk name")
>         log.warning(message)

Actions: View | Diff

Attachments on bug 857940: 613693 | 614793 | 614941