[PATCH] Add help texts to some Anaconda CLI options

Martin Kolman mkolman at redhat.com
Fri Jun 6 15:18:32 UTC 2014


--dnf, --extlinux, --noeject, --leavebootorder, --nomemcheck,
--memcheck, --updates and --nomount now have help texts.

Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 anaconda                  | 24 ++++++++++++++++--------
 data/anaconda_options.txt | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/anaconda b/anaconda
index b2a63d8..869def8 100755
--- a/anaconda
+++ b/anaconda
@@ -326,18 +326,26 @@ def parseArguments(argv=None, boot_cmdline=None):
 
     # Miscellaneous
     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("--nomount", dest="rescue_nomount", action="store_true", default=False,
+                    help=help_parser.help_text("nomount"))
+    ap.add_argument("--updates", dest="updateSrc", action="store", type=str,
+                    metavar="UPDATES_URL", help=help_parser.help_text("updates"))
     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,
                     help=help_parser.help_text("dirinstall"))
-    ap.add_argument("--memcheck", action="store_true", default=True)
-    ap.add_argument("--nomemcheck", action="store_false", dest="memcheck")
-    ap.add_argument("--leavebootorder", action="store_true", default=False)
-    ap.add_argument("--noeject", action="store_false", dest="eject", default=True)
-    ap.add_argument("--extlinux", action="store_true", default=False)
-    ap.add_argument("--dnf", action="store_true", default=False)
+    ap.add_argument("--memcheck", action="store_true", default=True,
+                    help=help_parser.help_text("memcheck"))
+    ap.add_argument("--nomemcheck", action="store_false", dest="memcheck",
+                    help=help_parser.help_text("nomemcheck"))
+    ap.add_argument("--leavebootorder", action="store_true", default=False,
+                    help=help_parser.help_text("leavebootorder"))
+    ap.add_argument("--noeject", action="store_false", dest="eject", default=True,
+                    help=help_parser.help_text("noeject"))
+    ap.add_argument("--extlinux", action="store_true", default=False,
+                    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)
 
     # some defaults change based on cmdline flags
diff --git a/data/anaconda_options.txt b/data/anaconda_options.txt
index 753609a..1f0bb14 100644
--- a/data/anaconda_options.txt
+++ b/data/anaconda_options.txt
@@ -1,3 +1,14 @@
+nomount
+Don't automatically mount any installed Linux partitions in rescue mode.
+
+updates
+Path to an updates image that is on local filesystem or available over FTP or HTTP.
+UPDATES_URL must be either a local filesystem path, a network URL or <disk>:<path> where
+<disk> can be one of sdX, /dev/sdX, LABEL=xxx, UUID=xxx and <path> defaults
+to /updates.img if missing. See the Anaconda docs for more details about the path specification.
+Please note that the updates image only updates the installation environment and is completely
+unrelated to package updates.
+
 dirinstall
 Use the device mounted at /mnt/sysimage as the installation
 destination. The --dirinstall and --image options are mutually
@@ -17,3 +28,34 @@ This option may be used multiple times to specify multiple disk
 images. It is an error to specify the same <path> twice or to use
 duplicate names. The --image and --dirinstall options are
 mutually exclusive.
+
+memcheck
+Check if the system has enough RAM to complete the installation
+and abort if it doesn't. Please note that this check is approximate
+and that memory usage during installation depends on the package
+selection, user interface (graphical vs text) and other parameters.
+
+nomemcheck
+Do not check if the system has enough RAM to complete the installation.
+Of course, any attempt to install with less than the safe minimum amount
+of memory may fail and is unsupported.
+
+leavebootorder
+Boot the drives in their existing order, to override the default of booting
+into the newly installed drive on Power Systems servers and EFI systems.
+This is useful for systems that, for example, should network boot first
+before falling back to a local boot.
+
+noeject
+Don't eject the installation CD/DVD (if any) once the installation
+has been completed. Ignored for image, directory and livecd installs.
+
+extlinux
+Use extlinux as the bootloader. Note that there's no attempt to validate
+that this will work for your platform or anything; it assumes that if you
+ask for it, you want to try.
+
+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
-- 
1.9.3



More information about the anaconda-patches mailing list