[PATCH] Add help texts for the remaining Anaconda options

Martin Kolman mkolman at redhat.com
Wed Jun 25 14:22:55 UTC 2014


--cmdline, --graphical, --text, --proxy, --debug, --kickstart,
--rescue, --armplatform, --multilib, --geoloc and --mpathfriendlynames
now have help texts.

Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 anaconda                  | 32 ++++++++++++++++++++------------
 data/anaconda_options.txt | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/anaconda b/anaconda
index a725e09..b07f43b 100755
--- a/anaconda
+++ b/anaconda
@@ -263,20 +263,27 @@ def parseArguments(argv=None, boot_cmdline=None):
 
     # Interface
     ap.add_argument("-C", "--cmdline", dest="display_mode", action="store_const", const="c",
-                    default="g")
-    ap.add_argument("-G", "--graphical", dest="display_mode", action="store_const", const="g")
-    ap.add_argument("-T", "--text", dest="display_mode", action="store_const", const="t")
+                    default="g", help=help_parser.help_text("cmdline"))
+    ap.add_argument("-G", "--graphical", dest="display_mode", action="store_const", const="g",
+                    help=help_parser.help_text("graphical"))
+    ap.add_argument("-T", "--text", dest="display_mode", action="store_const", const="t",
+                    help=help_parser.help_text("text"))
 
     # Network
-    ap.add_argument("--proxy")
+    ap.add_argument("--proxy", metavar='PROXY_URL', help=help_parser.help_text("proxy"))
 
     # Method of operation
-    ap.add_argument("-d", "--debug", dest="debug", action="store_true", default=False)
-    ap.add_argument("--ks", dest="ksfile", action="store_const", const="/run/install/ks.cfg")
-    ap.add_argument("--kickstart", dest="ksfile")
-    ap.add_argument("--rescue", dest="rescue", action="store_true", default=False)
-    ap.add_argument("--armplatform", dest="armPlatform", type=str)
-    ap.add_argument("--multilib", dest="multiLib", action="store_true", default=False)
+    ap.add_argument("-d", "--debug", dest="debug", action="store_true",
+                    default=False, help=help_parser.help_text("debug"))
+    ap.add_argument("--ks", "--kickstart", dest="ksfile", action="store_const",
+                    metavar="KICKSTART_URL", const="/run/install/ks.cfg",
+                    help=help_parser.help_text("kickstart"))
+    ap.add_argument("--rescue", dest="rescue", action="store_true", default=False,
+                    help=help_parser.help_text("rescue"))
+    ap.add_argument("--armplatform", dest="armPlatform", type=str, metavar="PLATFORM_ID",
+                    help=help_parser.help_text("armplatform"))
+    ap.add_argument("--multilib", dest="multiLib", action="store_true", default=False,
+                    help=help_parser.help_text("multilib"))
 
     ap.add_argument("-m", "--method", dest="method", default=None, metavar="METHOD",
                     help=help_parser.help_text("method"))
@@ -329,7 +336,7 @@ def parseArguments(argv=None, boot_cmdline=None):
     ap.add_argument("--ibft", action="store_true", help=help_parser.help_text("ibft"))
 
     # Geolocation
-    ap.add_argument("--geoloc")
+    ap.add_argument("--geoloc", metavar="PROVIDER_ID", help=help_parser.help_text("geoloc"))
 
     # Miscellaneous
     ap.add_argument("--nomount", dest="rescue_nomount", action="store_true", default=False,
@@ -352,7 +359,8 @@ def parseArguments(argv=None, boot_cmdline=None):
                     help=help_parser.help_text("extlinux"))
     ap.add_argument("--dnf", action="store_true", default=False,
                     help=help_parser.help_text("dnf"))
-    ap.add_argument("--mpathfriendlynames", action="store_true", default=True)
+    ap.add_argument("--mpathfriendlynames", action="store_true", default=True,
+                    help=help_parser.help_text("mpathfriendlynames"))
 
     # some defaults change based on cmdline flags
     if boot_cmdline is not None:
diff --git a/data/anaconda_options.txt b/data/anaconda_options.txt
index b2c83b8..3476341 100644
--- a/data/anaconda_options.txt
+++ b/data/anaconda_options.txt
@@ -1,3 +1,39 @@
+cmdline
+Force command line installation mode. This mode simply prints out text and does not allow any interactivity.
+All options must be specified either in a kickstart file or on the command line.
+
+graphical
+Force graphical installation. A graphical installation implies that the installed system will
+boot up into graphical.target, using whichever display manager is in use by the default desktop
+(gdm for GNOME, kdm for KDE).
+
+text
+Force text mode installation. This will install only base packages for a minimal system and implies
+that the installed system will boot up in text mode instead of to the graphical login screen.
+
+proxy
+Use the given proxy settings when performing an installation from a HTTP/HTTPS/FTP source.
+The PROXY_URL can be specified like this: [PROTOCOL://][USERNAME[:PASSWORD]@]HOST[:PORT]
+
+debug
+Show debug level messages in the log watching consoles.
+This basically a shortcut for for loglevel=debug.
+
+kickstart
+Gives the location of the kickstart file to be used for installation. The KICKSTART_URL
+supports fetching kickstarts from HTTP/S, FTP, NFS, from a local file, from a local
+harddrive, from an optical disk and from BIOS RAID sets. For details on the KICKSTART_URL
+syntax see the Anaconda options wiki page: http://fedoraproject.org/wiki/Anaconda_Boot_Options
+
+rescue
+Start the rescue environment instead of installation.
+
+armplatform
+Can be used to specify the ARM platform for the installation by passing the appropriate PLATFORM_ID.
+
+multilib
+Enable yum's multlib_policy of "all" instead of the default of "best".
+
 method
 This option is deprecated in favor of the repo option. For now, it does the same thing as repo,
 but will be removed in the future.
@@ -110,6 +146,11 @@ Disable iBFT usage during the installation.
 ibft
 Enable iBFT (iSCSI Boot Firmware Table) usage during the installation (default).
 
+geoloc
+Configure geolocation usage in Anaconda. Geolocation is used to pre-set language and time zone.
+The following values for PROVIDER_ID are supported: 0 - disable geolocation, "provider_fedora_geoip"
+- use the Fedora GeoIP API (default) and "provider_hostip" - use the Hostip.info GeoIP API.
+
 nomount
 Don't automatically mount any installed Linux partitions in rescue mode.
 
@@ -171,3 +212,7 @@ dnf
 Use the experimental DNF package management backend instead of the YUM backend
 that is used by default. For more information about the DNF project see:
 http://dnf.baseurl.org
+
+mpathfriendlynames
+Tell multipathd to use user friendly names when naming devices during the installation.
+See the multipathd documentation for more info.
-- 
1.9.3



More information about the anaconda-patches mailing list