[PATCH] Remove the dlable option

Vratislav Podzimek vpodzime at redhat.com
Fri Jun 6 06:15:07 UTC 2014


On Thu, 2014-06-05 at 16:44 +0200, Martin Kolman wrote:
> The dlable option no longer does anything. Driverdisc are now configured using
> the dd option documented in docs/driverdisc.txt.
> 
> Signed-off-by: Martin Kolman <mkolman at redhat.com>
> ---
>  anaconda            | 4 ----
>  docs/driverdisc.txt | 4 +---
>  pyanaconda/flags.py | 1 -
>  3 files changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/anaconda b/anaconda
> index 27f1577..b2a63d8 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -328,7 +328,6 @@ def parseArguments(argv=None, boot_cmdline=None):
>      ap.add_argument("--module", action="append", default=[])
>      ap.add_argument("--nomount", dest="rescue_nomount", action="store_true", default=False)
>      ap.add_argument("--updates", dest="updateSrc", action="store", type=str)
> -    ap.add_argument("--dlabel", action="store_true", default=False)
>      ap.add_argument("--image", action="append", dest="images", default=[],
>                      metavar="IMAGE_SPEC", help=help_parser.help_text("image"))
>      ap.add_argument("--dirinstall", action="store_true", default=False,
> @@ -861,9 +860,6 @@ if __name__ == "__main__":
>      # Default is to prompt to mount the installed system.
>      anaconda.rescue_mount = not opts.rescue_nomount
>  
> -    if opts.dlabel:  # autodetected driverdisc in use
> -        flags.dlabel = True
> -
>      if opts.proxy:
>          anaconda.proxy = opts.proxy
>  
> diff --git a/docs/driverdisc.txt b/docs/driverdisc.txt
> index d64509b..1e28c39 100644
> --- a/docs/driverdisc.txt
> +++ b/docs/driverdisc.txt
> @@ -47,9 +47,7 @@ Please consult the appropriate Installer Guide for further information.
>  Automatic DriverDisc detection
>  ------------------------------
>  
> -Anaconda can be told to look for driverdisc automatically by using 'dlabel=on'
> -kernel command line argument. This is enabled by default in Red Hat Enterprise
> -Linux version of Anaconda.
> +Anaconda automatically looks for driverdiscs during startup.
>  
>  The DriverDisc has to be on partition or filesystem which has been labeled
>  with 'OEMDRV' label.
> diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
> index 8d380ab..4613f48 100644
> --- a/pyanaconda/flags.py
> +++ b/pyanaconda/flags.py
> @@ -45,7 +45,6 @@ class Flags(object):
>      def __init__(self, read_cmdline=True):
>          self.__dict__['_in_init'] = True
>          self.livecdInstall = 0
> -        self.dlabel = 0
>          self.ibft = 1
>          self.iscsi = 0
>          self.usevnc = 0
Looks good to me with the typo fixed.

-- 
Vratislav Podzimek

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




More information about the anaconda-patches mailing list