Related: rhbz#1061646
Default iface name in the form of <PARENT>.<VLANID> can hit kernel limit
on lenghth of interface name (15 chars), so offer an option to choose
another vlan name.
---
pykickstart/commands/network.py | 22 ++++++++++++++++++++++
pykickstart/handlers/control.py | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/pykickstart/commands/network.py b/pykickstart/commands/network.py
index debdf6f..2c32590 100644
--- a/pykickstart/commands/network.py
+++ b/pykickstart/commands/network.py
@@ -263,6 +263,21 @@ class RHEL6_NetworkData(F8_NetworkData):
return retval
+class RHEL7_NetworkData(F20_NetworkData):
+ removedKeywords = F20_NetworkData.removedKeywords
+ removedAttrs = F20_NetworkData.removedAttrs
+
+ def __init__(self, *args, **kwargs):
+ F20_NetworkData.__init__(self, *args, **kwargs)
+ self.interfacename = kwargs.get("interfacename", "")
+
+ def _getArgsAsStr(self):
+ retval = F20_NetworkData._getArgsAsStr(self)
+ if self.interfacename:
+ retval += " --interfacename=%s" % self.interfacename
+
+ return retval
+
class FC3_Network(KickstartCommand):
removedKeywords = KickstartCommand.removedKeywords
removedAttrs = KickstartCommand.removedAttrs
@@ -501,3 +516,10 @@ class RHEL6_Network(F9_Network):
op.add_option("--bondslaves", dest="bondslaves")
op.add_option("--bondopts", dest="bondopts")
return op
+
+class RHEL7_Network(F20_Network):
+ def _getParser(self):
+ op = F20_Network._getParser(self)
+ op.add_option("--interfacename", dest="interfacename",
action="store",
+ default="")
+ return op
diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
index 7f9efb8..9d3bbf0 100644
--- a/pykickstart/handlers/control.py
+++ b/pykickstart/handlers/control.py
@@ -1347,7 +1347,7 @@ commandMap = {
"mediacheck": mediacheck.FC4_MediaCheck,
"method": method.F19_Method,
"multipath": multipath.FC6_MultiPath,
- "network": network.F20_Network,
+ "network": network.RHEL7_Network,
"nfs": nfs.FC6_NFS,
"part": partition.F20_Partition,
"partition": partition.F20_Partition,
@@ -1724,7 +1724,7 @@ dataMap = {
"IscsiData": iscsi.F17_IscsiData,
"LogVolData": logvol.F20_LogVolData,
"MultiPathData": multipath.FC6_MultiPathData,
- "NetworkData": network.F20_NetworkData,
+ "NetworkData": network.RHEL7_NetworkData,
"PartData": partition.F18_PartData,
"RaidData": raid.F18_RaidData,
"RepoData": repo.F15_RepoData,
--
1.7.11.7