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

Re: [PATCH 04/13] Finish removing bootloadersetup step.



Ack.

David Lehman <dlehman redhat com> wrote:

> ---
>  pyanaconda/bootloader.py |   16 ----------------
>  pyanaconda/dispatch.py   |    2 +-
>  pyanaconda/packages.py   |   14 ++++++++++----
>  3 files changed, 11 insertions(+), 21 deletions(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 96f337a..9d9d794 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -1732,22 +1732,6 @@ class SILO(YabootSILOBase):
>  
>  """ anaconda-specific functions """
>  
> -# this doesn't need to exist anymore, but the messageWindow probably needs to
> -# go somewhere
> -def bootloaderSetupChoices(anaconda):
> -    if anaconda.dir == DISPATCH_BACK:
> -        rc = anaconda.intf.messageWindow(_("Warning"),
> -                _("Filesystems have already been activated.  You "
> -                  "cannot go back past this point.\n\nWould you like to "
> -                  "continue with the installation?"),
> -                type="custom", custom_icon=["error","error"],
> -                custom_buttons=[_("_Exit installer"), _("_Continue")])
> -
> -        if rc == 0:
> -            sys.exit(0)
> -        return DISPATCH_FORWARD
> -
> -
>  def writeSysconfigKernel(anaconda, default_kernel):
>      f = open(anaconda.rootPath + "/etc/sysconfig/kernel", "w+")
>      f.write("# UPDATEDEFAULT specifies if new-kernel-pkg should make\n"
> diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
> index c67e96a..092d31f 100644
> --- a/pyanaconda/dispatch.py
> +++ b/pyanaconda/dispatch.py
> @@ -33,7 +33,7 @@ from packages import setFileCons
>  from storage import storageInitialize
>  from storage import storageComplete
>  from storage.partitioning import doAutoPartition
> -from bootloader import writeBootloader, bootloaderSetupChoices
> +from bootloader import writeBootloader
>  from flags import flags
>  from upgrade import upgradeMountFilesystems
>  from upgrade import restoreTime
> diff --git a/pyanaconda/packages.py b/pyanaconda/packages.py
> index d373856..cec96b8 100644
> --- a/pyanaconda/packages.py
> +++ b/pyanaconda/packages.py
> @@ -87,10 +87,16 @@ def copyAnacondaLogs(anaconda):
>  
>  def turnOnFilesystems(anaconda):
>      if anaconda.dir == DISPATCH_BACK:
> -        if not anaconda.upgrade:
> -            log.info("unmounting filesystems")
> -            anaconda.storage.umountFilesystems()
> -        return DISPATCH_DEFAULT
> +        rc = anaconda.intf.messageWindow(_("Warning"),
> +                _("Filesystems have already been activated.  You "
> +                  "cannot go back past this point.\n\nWould you like to "
> +                  "continue with the installation?"),
> +                type="custom", custom_icon=["error","error"],
> +                custom_buttons=[_("_Exit installer"), _("_Continue")])
> +
> +        if rc == 0:
> +            sys.exit(0)
> +        return DISPATCH_FORWARD
>  
>      if not anaconda.upgrade:
>          if (flags.livecdInstall and
> -- 
> 1.7.3.4
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

-- 
David Cantrell <dcantrell redhat com>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Seattle, WA | UTC-7


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