[anaconda][rhel7-branch][PATCH] Correctly propagate --ipv6gateway to ifcfg files(#1170845)

[Martin Kolman]

Original patch by Masahiro Matsuya.

Resolves: rhbz#1170845
Signed-off-by: Martin Kolman 
---
 dracut/parse-kickstart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 43db89f..08a26f8 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -417,13 +417,13 @@ def ksnet_to_ifcfg(net, filename=None):
         if net.ipv6 == 'dhcp':
             ifcfg['DHCPV6C'] = "yes"
             ifcfg['IPV6_AUTOCONF'] = "no"
-            if net.ipv6gateway:
-                ifcfg['IPV6_DEFAULTGW'] = net.ipv6gateway
         elif net.ipv6 == 'auto':
             ifcfg['IPV6_AUTOCONF'] = "yes" # NOTE: redundant (this is the default)
         elif ':' in net.ipv6:
             ifcfg['IPV6ADDR'] = net.ipv6
             ifcfg['IPV6_AUTOCONF'] = "no"
+            if net.ipv6gateway:
+                ifcfg['IPV6_DEFAULTGW'] = net.ipv6gateway

# misc stuff
     if net.mtu:

[Radek Vykydal]

Ack.

On 06/30/2015 08:13 PM, Martin Kolman wrote:
> Original patch by Masahiro Matsuya.
>
> Resolves: rhbz#1170845
> Signed-off-by: Martin Kolman
>
> dracut/parse-kickstart | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
> index 43db89f..08a26f8 100755
> --- a/dracut/parse-kickstart
> +++ b/dracut/parse-kickstart
> @@ -417,13 +417,13 @@ def ksnet_to_ifcfg(net, filename=None):
>           if net.ipv6 == 'dhcp':
>               ifcfg['DHCPV6C'] = "yes"
>               ifcfg['IPV6_AUTOCONF'] = "no"
>        if net.ipv6gateway:
>            ifcfg['IPV6_DEFAULTGW'] = net.ipv6gateway
>     elif net.ipv6 == 'auto':
>         ifcfg['IPV6_AUTOCONF'] = "yes" # NOTE: redundant (this is the default)
>     elif ':' in net.ipv6:
>         ifcfg['IPV6ADDR'] = net.ipv6
>         ifcfg['IPV6_AUTOCONF'] = "no"
>        if net.ipv6gateway:
>            ifcfg['IPV6_DEFAULTGW'] = net.ipv6gateway
>
> # misc stuff
> if net.mtu: