* anaconda (parseOptions): Add the --noipv4 and --noipv6 opts (#208334).

        * anaconda (__main__): Set flags.useIPv4 and flags.useIPv6 to false if
        we receive one of the --noipv{4,6} options (#208334).

        * flags.py (Flags): Add useIPv4 and useIPv6 flags, default to
        True (#208334).

        * network.py (Network): Initialize self.useIPv4 and self.useIPv6 to
        flags.useIPv4 and flags.useIPv6 (#208334).

        * loader2/loader.c (doLoaderMain): After readNetConfig() call, set the
        noipv4 and noipv6 flags in loaderData (#208334).
        * loader2/loader.c (main): If noipv4 or noipv6 flag is set in the
        loaderData, add option to pass to anaconda (#208334).

        * loader2/net.c (readNetConfig): Set noipv4 and noipv6 flags in newCfg
        after configureTCPIP() call (#208334).
        * loader2/net.c (readNetConfig): After dialog window closes, copy the
        noipv4 and noipv6 flags from newCfg to cfg (#208334).

1 files changed, 10 insertions, 0 deletions

diff --git a/anaconda b/anaconda
index ea5a8ae63..6881e4981 100755
--- a/anaconda
+++ b/anaconda
@@ -189,6 +189,10 @@ def parseOptions():
     op.add_option("-G", "--graphical", dest="display_mode", action="store_const", const="g")
     op.add_option("-T", "--text", dest="display_mode", action="store_const", const="t")
 
+    # Network
+    op.add_option("--noipv4", action="store_true", default=False)
+    op.add_option("--noipv6", action="store_true", default=False)
+
     # Method of operation
     op.add_option("--autostep", action="store_true", default=False)
     op.add_option("-d", "--debug", dest="debug", action="store_true", default=False)
@@ -631,6 +635,12 @@ if __name__ == "__main__":
     # Default is to prompt to mount the installed system.
     anaconda.rescue_mount = not opts.rescue_nomount
 
+    if opts.noipv4:
+        flags.useIPv4 = False
+
+    if opts.noipv6:
+        flags.useIPv6 = False
+
     if opts.updateSrc:
         anaconda.updateSrc = opts.updateSrc