[rhel6-branch] Keep track of whether users should be prompted to format CDL dasds. (#1164240)
Samantha N. Bueno
sbueno+anaconda at redhat.com
Mon Mar 9 12:32:33 UTC 2015
Er, my brain segfaulted. The title should be "....prompted to format LDL
dasds". CDL do not need to be (re)formatted.
On Mon, Mar 09, 2015 at 08:20:46AM -0400, Samantha N. Bueno wrote:
> A small logical error made it so that LDL dasds were always formatted
> with dasdfmt, even if --cdl was not specified in kickstart.
>
> Thanks to Jan Stodola <jstodola at redhat.com> for the patch.
>
> Related: rhbz#1164240
> ---
> storage/dasd.py | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/storage/dasd.py b/storage/dasd.py
> index 17f81bd..2dba34b 100644
> --- a/storage/dasd.py
> +++ b/storage/dasd.py
> @@ -105,10 +105,13 @@ class DASD:
> bypath))
> self._ldldasdlist.append((device, bypath))
>
> - askUser = True
> + askUser_zeroMbr = True
> + askUser_cdl = True
>
> - if zeroMbr or cdl:
> - askUser = False
> + if zeroMbr:
> + askUser_zeroMbr = False
> + if cdl:
> + askUser_cdl = False
> elif not intf and not zeroMbr:
> log.info(" non-interactive kickstart install without zerombr "
> "command, unable to run dasdfmt, exiting installer")
> @@ -118,12 +121,12 @@ class DASD:
> if not len(self._dasdlist):
> log.info(" no unformatted DASD devices found")
> else:
> - self.format_dasds(intf, askUser, self._dasdlist)
> + self.format_dasds(intf, askUser_zeroMbr, self._dasdlist)
>
> if not len(self._ldldasdlist):
> log.info(" no LDL DASD devices found")
> else:
> - self.format_dasds(intf, askUser, self._ldldasdlist)
> + self.format_dasds(intf, askUser_cdl, self._ldldasdlist)
>
> def format_dasds(self, intf, askUser, dasdlist):
> """ Iterate through a given list of DASDs and run dasdfmt on them. """
> --
> 1.9.3
>
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
More information about the anaconda-patches
mailing list