[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Don't pass the default clearPartType value to the device tree.



> diff --git a/storage/__init__.py b/storage/__init__.py
> index 033eeb6..d37fa40 100644
> --- a/storage/__init__.py
> +++ b/storage/__init__.py
> @@ -281,10 +281,18 @@ class Storage(object):
>                                            _("Finding storage devices..."))
>          self.iscsi.startup(self.anaconda.intf)
>          self.zfcp.startup()
> +        if not self.anaconda.isKickstart:
> +            # clearPartType defaults to CLEARPART_TYPE_LINUX, but the user
> +            # has not made any selection, so we need to ignore it during
> +            # population of the device tree
> +            clearPartType = CLEARPART_TYPE_NONE
> +        else:
> +            clearPartType = self.clearPartType
> +
>          self.devicetree = DeviceTree(intf=self.anaconda.intf,
>                                       ignored=self.ignoredDisks,
>                                       exclusive=self.exclusiveDisks,
> -                                     type=self.clearPartType,
> +                                     type=clearPartType,
>                                       clear=self.clearPartDisks,
>                                       reinitializeDisks=self.reinitializeDisks,
>                                       protected=self.protectedPartitions,

I'm nervous about any changes to clearpart code, but it doesn't change
the kickstart case at all and I can't think of why we'd care about
prompting for encrypted disks on interactive installs.  So I say go for
it.

- Chris


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]