Change in vdsm[master]: ifcfg: always print IPV6INIT=yes/no
osvoboda at redhat.com
osvoboda at redhat.com
Wed May 6 13:02:27 UTC 2015
Ondřej Svoboda has uploaded a new change for review.
Change subject: ifcfg: always print IPV6INIT=yes/no
......................................................................
ifcfg: always print IPV6INIT=yes/no
EL6's /etc/sysconfig/network-scripts/ifup-ipv6 had a condition:
[ "$IPV6INIT" = "yes" ] || exit 0
which changed to an inverted one in EL7:
[[ "$IPV6INIT" = [nN0]* ]] && exit 0
This makes IPV6INIT mandatory in ifcfg files.
Change-Id: I364cfaebc79624c6ab1153cf26bd3ca2a2c4ef18
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M vdsm/network/configurators/ifcfg.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/40610/1
diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py
index 6d35c0a..26efd6f 100644
--- a/vdsm/network/configurators/ifcfg.py
+++ b/vdsm/network/configurators/ifcfg.py
@@ -583,8 +583,9 @@
if ipv4.defaultRoute is not None:
cfg += 'DEFROUTE=%s\n' % _to_ifcfg_bool(ipv4.defaultRoute)
cfg += 'NM_CONTROLLED=no\n'
- if ipv6.address or ipv6.ipv6autoconf or ipv6.dhcpv6:
- cfg += 'IPV6INIT=yes\n'
+ enable_ipv6 = ipv6.address or ipv6.ipv6autoconf or ipv6.dhcpv6
+ cfg += 'IPV6INIT=%s\n' % _to_ifcfg_bool(enable_ipv6)
+ if enable_ipv6:
if ipv6.address is not None:
cfg += 'IPV6ADDR=%s\n' % pipes.quote(ipv6.address)
if ipv6.gateway is not None:
--
To view, visit https://gerrit.ovirt.org/40610
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I364cfaebc79624c6ab1153cf26bd3ca2a2c4ef18
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>
More information about the vdsm-patches
mailing list