On Mon, 2014-06-02 at 14:46 +0200, Radek Vykydal wrote:
Resolves: rhbz#1103571
IPADDRn (and GATEWAYn, PREFIXn) would be created in ifcfg files when
configuring network in GUI (using NM Connection Editor) or in kickstart.
Dracut's write-ifcfg.sh still generates IPADDR without the suffix.
---
pyanaconda/network.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 75d2711..d0deb89 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -354,18 +354,20 @@ def dracutBootArguments(devname, ifcfg, storage_ipaddr,
hostname=None):
if ifcfg.get('bootproto').lower() == 'dhcp':
netargs.add("ip=%s:dhcp" % devname)
else:
- if ifcfg.get('GATEWAY'):
- gateway = ifcfg.get('GATEWAY')
+ cfgidx = ''
+ if ifcfg.get('IPADDR0'):
+ cfgidx = '0'
+ if ifcfg.get('GATEWAY%s' % cfgidx):
+ gateway = ifcfg.get('GATEWAY%s' % cfgidx)
else:
gateway = ""
-
- netmask = ifcfg.get('netmask')
- prefix = ifcfg.get('prefix')
+ netmask = ifcfg.get('NETMASK%s' % cfgidx)
+ prefix = ifcfg.get('PREFIX%s' % cfgidx)
if not netmask and prefix:
netmask = prefix2netmask(int(prefix))
-
- netargs.add("ip=%s::%s:%s:%s:%s:none" %
(ifcfg.get('ipaddr'),
- gateway, netmask, hostname, devname))
+ ipaddr = ifcfg.get('IPADDR%s' % cfgidx)
+ netargs.add("ip=%s::%s:%s:%s:%s:none" %
+ (ipaddr, gateway, netmask, hostname, devname))
hwaddr = ifcfg.get("HWADDR")
if hwaddr:
Looks good to me, ACK!