[PATCH] Narrow down the list of suggested mountpoints to those supported by arch.

Vratislav Podzimek vpodzime at redhat.com
Wed Jun 26 10:05:04 UTC 2013


On Tue, 2013-06-25 at 11:15 -0400, Chris Lumens wrote:
> It doesn't make a lot of sense to suggest prepboot and biosboot on platforms
> that do not support them.
> ---
>  pyanaconda/ui/gui/spokes/custom.py | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> index ef5b32c..e0b4ff6 100644
> --- a/pyanaconda/ui/gui/spokes/custom.py
> +++ b/pyanaconda/ui/gui/spokes/custom.py
> @@ -41,6 +41,7 @@ from blivet import devicefactory
>  from blivet.formats import device_formats
>  from blivet.formats import getFormat
>  from blivet.formats.fs import FS
> +from blivet.platform import platform
>  from blivet.size import Size
>  from blivet import Root
>  from blivet.devicefactory import DEVICE_TYPE_LVM
> @@ -173,8 +174,18 @@ def ui_storage_logger():
>  
>  def populate_mountpoint_store(store, used_mountpoints):
>      # sure, add whatever you want to this list. this is just a start.
> -    paths = ["/", "/boot", "/boot/efi", "/home", "/usr", "/var",
> -             "swap", "biosboot", "prepboot"]
> +    paths = ["/", "/boot", "/home", "/usr", "/var"] + \
> +            platform.bootStage1ConstraintDict["mountpoints"]
> +
> +    # Sort the list now so all the real mountpoints go to the front, then
> +    # add all the pseudo mountpoints we have.
> +    paths.sort()
> +    paths += ["swap"]
> +
> +    for fmt in ["appleboot", "biosboot", "prepboot"]:
> +        if getFormat(fmt).supported:
> +            paths += [fmt]
> +
>      for path in paths:
>          if path not in used_mountpoints:
>              store.append([path])
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list