[PATCH rhel7-branch] network: don't pop HWADDR twice for vlan on s390 (#1061646)
Samantha N. Bueno
sbueno+anaconda at redhat.com
Mon Mar 24 13:14:09 UTC 2014
Looks good to me.
On Mon, Mar 24, 2014 at 11:43:58AM +0100, Radek Vykydal wrote:
> Related: rhbz#1061646
> ---
> dracut/parse-kickstart | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
> index 562d4f9..a8ece63 100755
> --- a/dracut/parse-kickstart
> +++ b/dracut/parse-kickstart
> @@ -393,7 +393,7 @@ def ksnet_to_ifcfg(net, filename=None):
> shutil.copyfile(srcpath, dstpath)
>
> if net.bondslaves:
> - ifcfg.pop('HWADDR')
> + ifcfg.pop('HWADDR', None)
> ifcfg['TYPE'] = "Bond"
> ifcfg['BONDING_MASTER'] = "yes"
> ifcfg['NAME'] = "Bond connection %s" % dev
> @@ -418,7 +418,7 @@ def ksnet_to_ifcfg(net, filename=None):
>
> if net.teamslaves:
>
> - ifcfg.pop('HWADDR')
> + ifcfg.pop('HWADDR', None)
> ifcfg['TYPE'] = "Team"
> ifcfg['NAME'] = "Team connection %s" % dev
> ifcfg['TEAM_CONFIG'] = "'" + net.teamconfig + "'"
> @@ -442,7 +442,7 @@ def ksnet_to_ifcfg(net, filename=None):
>
> if net.vlanid:
> interface_name = net.interfacename or "%s.%s" % (dev, net.vlanid)
> - ifcfg.pop('HWADDR')
> + ifcfg.pop('HWADDR', None)
> ifcfg['TYPE'] = "Vlan"
> ifcfg['VLAN'] = "yes"
> ifcfg['VLAN_ID'] = net.vlanid
> --
> 1.7.11.7
>
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
More information about the anaconda-patches
mailing list