diff options
| author | David Lehman <dlehman@redhat.com> | 2012-09-26 15:34:19 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2012-09-28 13:54:29 -0500 |
| commit | 3ca57230b4c02ec80a8391f0195ba6cf4915c612 (patch) | |
| tree | 67cd376679a8e1b165df393aa2667d5090b4bf2b /pyanaconda/bootloader.py | |
| parent | 37aecf4b5f836fce59f28c594abb9fa3cf5202b9 (diff) | |
| download | anaconda-3ca57230b4c02ec80a8391f0195ba6cf4915c612.tar.gz anaconda-3ca57230b4c02ec80a8391f0195ba6cf4915c612.tar.xz anaconda-3ca57230b4c02ec80a8391f0195ba6cf4915c612.zip | |
Fix bootloader setup on s390. (#857940)
Diffstat (limited to 'pyanaconda/bootloader.py')
| -rw-r--r-- | pyanaconda/bootloader.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 16f984855..0ca491aef 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" |