[rhel6-branch] Fix bootloader issues on s390x. (#875644, #894050, #1008941)

Brian C. Lane bcl at redhat.com
Fri Oct 4 16:16:05 UTC 2013


On Fri, Oct 04, 2013 at 10:03:48AM -0400, Samantha N. Bueno wrote:

> +    def prepBootDev(self, instRoot):
> +        rc = iutil.execWithCapture("zipl", [], root = instRoot,
> +                                   stderr = "/dev/stderr",
> +                                   fatal = True)
> +        for line in rc.splitlines():
> +            if line.startswith("Preparing boot device: "):
> +                # Output here may look like:
> +                #     Preparing boot device: dasdb (0200).
> +                #     Preparing boot device: dasdl.
> +                # We want to extract the device name and pass that.
> +
> +                fields = line[23:].split()
> +                self.setDevice(fields[0].replace('.', ''))
> +        return

Not really any need for a return here.

> +
> +
>      def write(self, instRoot, bl, kernelList, chainList,
>              defaultDev):
> +        if self.doUpgradeOnly:
> +            return self.writeZipl(instRoot, bl, kernelList,
> +                                    chainList, defaultDev,
> +                                    upgrade=True)
> +
>          rc = self.writeZipl(instRoot, bl, kernelList, 
>                              chainList, defaultDev,
>                              not self.useZiplVal)

Drop 'not self.useZiplVal' since that arg now means upgrade.

Looks good other than that.

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 482 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/anaconda-patches/attachments/20131004/c01c6900/attachment.sig>


More information about the anaconda-patches mailing list