[PATCH rhel6-branch] Enable support for static ipv6= cmdline option (#679108)

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

 



Resolves: rhbz#679108

Port from master.

---
 loader/loader.c |   21 +++------------------
 1 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index c1ee607..bc33c89 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -869,24 +869,9 @@ static void parseCmdLineIp(struct loaderData_s * loaderData, char *argv)
  */
 static void parseCmdLineIpv6(struct loaderData_s * loaderData, char *argv)
 {
-    /* right now we only accept ipv6= arguments equal to:
-     *     dhcp     DHCPv6 call
-     *     auto     RFC 2461 neighbor discovery
-     */
-    loaderData->ipv6 = NULL;
-
-    if (!strncmp(str2lower(argv), "ipv6=dhcp", 9)) {
-        loaderData->ipv6 = strdup("dhcp");
-    } else if (!strncmp(str2lower(argv), "ipv6=auto", 9)) {
-        loaderData->ipv6 = strdup("auto");
-    }
-
-    if (loaderData->ipv6 != NULL) {
-        loaderData->ipv6info_set = 1;
-        flags |= LOADER_FLAGS_IPV6_PARAM;
-    }
-
-    return;
+    loaderData->ipv6 = strdup(argv+5);
+    loaderData->ipv6info_set = 1;
+    flags |= LOADER_FLAGS_IPV6_PARAM;
 }
 #endif
 
-- 
1.7.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux