summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadek Vykydal <rvykydal@redhat.com>2011-11-01 11:17:30 +0100
committerRadek Vykydal <rvykydal@redhat.com>2011-11-01 11:17:30 +0100
commit8188044b57568f641ac4feec7a02528c0403e6fa (patch)
tree2ed8b2b6c12e7a9c04c44ac0dad04c09d67955f4
parent5bf4c0959c31ceaa59215c2480cc7968d4c717bd (diff)
downloadanaconda-8188044b57568f641ac4feec7a02528c0403e6fa.tar.gz
anaconda-8188044b57568f641ac4feec7a02528c0403e6fa.tar.xz
anaconda-8188044b57568f641ac4feec7a02528c0403e6fa.zip
Support prefix length in kickstart network --ipv6 option.
e.g. network --ipv6=2001:aaaa::1/48
-rw-r--r--loader/kickstart.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/loader/kickstart.c b/loader/kickstart.c
index ebb249da9..320dfb3ec 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -724,6 +724,8 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand
#ifdef ENABLE_IPV6
free(loaderData->ipv6);
loaderData->ipv6 = NULL;
+ free(loaderData->ipv6prefix);
+ loaderData->ipv6prefix = NULL;
loaderData->ipv6info_set = 0;
free(loaderData->gateway6);
loaderData->gateway6 = NULL;
@@ -745,6 +747,11 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand
#ifdef ENABLE_IPV6
_setNetworkString(ele, "ipv6", &loaderData->ipv6, &loaderData->ipv6info_set);
+ if (loaderData->ipv6) {
+ split_ipv6addr_prefix_length(loaderData->ipv6,
+ &(loaderData->ipv6),
+ &(loaderData->ipv6prefix));
+ }
#endif
_setNetworkString(ele, "nameserver", &loaderData->dns, NULL);