[RHEL 7.2/PATCH] Disable Label Entry for PPC PReP Boot (#1172773)
Vratislav Podzimek
vpodzime at redhat.com
Thu Jul 2 06:12:33 UTC 2015
On Wed, 2015-07-01 at 18:30 -0400, Robert Marshall wrote:
> The manual partitioning window in the installer allowed users to
> type in and attempt to set a label on PPC PReP Boot filesystems.
> This would cause the installer to register an error and go back to the
> previous settings. Updated the behavior to automatically clear the
> label if the PPC PReP Boot filesystem type is chosen and disabled
> the label entry field to prevent users from being able to enter
> information that is invalid for this filesystem type. This fix will
> also do the same for any other filesystem format that does not
> support labels.
>
> Resolves: rhbz#1172773
> ---
> pyanaconda/ui/gui/spokes/custom.py | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> index 77f3414..0644cc6 100644
> --- a/pyanaconda/ui/gui/spokes/custom.py
> +++ b/pyanaconda/ui/gui/spokes/custom.py
> @@ -1389,7 +1389,12 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> self._labelEntry.set_text(device.format.label)
> else:
> self._labelEntry.set_text("")
> - fancy_set_sensitive(self._labelEntry, True)
> +
> + # Only Allow Labels on Filesystems Supporting It
> + if device.format.labeling():
> + fancy_set_sensitive(self._labelEntry, True)
> + else:
> + fancy_set_sensitive(self._labelEntry, False)
This could be reduced to:
fancy_set_sensitive(self._labelEntry, device.format.labeling())
>
> self._device_size_text = device.size.humanReadable(max_places=2)
> self._sizeEntry.set_text(self._device_size_text)
> @@ -2308,6 +2313,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> fmt = getFormat(new_type)
> fancy_set_sensitive(self._mountPointEntry, fmt.mountable)
>
> + # Only Allow Labels on Filesystems Supporting It
> + if fmt.labeling():
> + fancy_set_sensitive(self._labelEntry, True)
> + else:
> + fancy_set_sensitive(self._labelEntry, False)
> + self._labelEntry.set_text("")
> +
> def _populate_container(self, device=None):
> """ Set up the vg widgets for lvm or hide them for other types. """
> device_type = self._get_current_device_type()
Looks good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list