[PATCH rhel6-branch] network: add kickstart --domain (ifcfg DOMAIN) option (#1039051)
Radek Vykydal
rvykydal at redhat.com
Wed May 7 08:44:42 UTC 2014
Resolves: rhbz#1039051
---
anaconda.spec.in | 2 +-
kickstart.py | 3 +++
loader/net.c | 4 ++++
network.py | 3 +++
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index b41f3e3..0512cf1 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define intltoolver 0.31.2-3
%define libnlver 1.0
%define libselinuxver 1.6
-%define pykickstartver 1.74.14
+%define pykickstartver 1.74.15
%define rpmpythonver 4.2-0.61
%define slangver 2.0.6-2
%define yumver 2.9.2
diff --git a/kickstart.py b/kickstart.py
index 3091299..a5b65a8 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -685,6 +685,9 @@ class NetworkData(commands.network.RHEL6_NetworkData):
anaconda.id.network.setHostname(self.hostname)
anaconda.id.network.overrideDHCPhostname = True
+ if self.domain
+ dev.set(("DOMAIN", self.domain))
+
activate_new_device = False
if not dev:
if self.bondslaves:
diff --git a/loader/net.c b/loader/net.c
index 5a03ebc..40db43f 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1749,6 +1749,8 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
{ "vlanid", 0, 0, G_OPTION_ARG_INT, &vlanid, NULL, NULL },
{ "bondslaves", 0, 0, G_OPTION_ARG_STRING, &loaderData->bonding_slaves, NULL, NULL},
{ "bondopts", 0, 0, G_OPTION_ARG_STRING, &loaderData->bonding_opts, NULL, NULL},
+ { "domain", 'd', 0, G_OPTION_ARG_STRING, &loaderData->domain,
+ NULL, NULL },
{ NULL },
};
@@ -1782,6 +1784,8 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
loaderData->bonding_slaves = NULL;
free(loaderData->bonding_opts);
loaderData->bonding_opts = NULL;
+ free(loaderData->domain);
+ loaderData->domain = NULL;
#ifdef ENABLE_IPV6
free(loaderData->ipv6);
diff --git a/network.py b/network.py
index 29f17c4..c6f215c 100644
--- a/network.py
+++ b/network.py
@@ -571,6 +571,9 @@ class Network:
if dev.get("TYPE") == "Vlan":
line += " --vlanid %s" % vlanid
+ if dev.get("DOMAIN"):
+ line += " --domain %s" % dev.get("DOMAIN")
+
line += "\n"
f.write(line)
--
1.7.11.7
More information about the anaconda-patches
mailing list