[PATCH] 40network/ifup.sh: do_static() and do_ipv6auto return 0 if no errors.

[PATCH] 40network/ifup.sh: do_static() and do_ipv6auto return 0 if no errors.

[WANG Chao]

Commit a0be1ed removes some lines from do_static() and do_ipv6auto().

When $hostname is empty, do_static() and do_ipv6auto() will return 1
and fails to run setup_net at the last of ifup.sh

Signed-off-by: WANG Chao <chaowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 modules.d/40network/ifup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 95289c9..db233de 100755
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -88,6 +88,8 @@ do_ipv6auto() {
     wait_for_if_up $netif
 
     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    return 0
 }
 
 # Handle static ip configuration
@@ -108,6 +110,8 @@ do_static() {
 
     [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    return 0
 }
 
 # loopback is always handled the same way
-- 
1.7.12.2

Re: [PATCH] 40network/ifup.sh: do_static() and do_ipv6auto return 0 if no errors.

[Harald Hoyer]

Am 18.10.2012 10:43, schrieb WANG Chao:
> Commit a0be1ed removes some lines from do_static() and do_ipv6auto().
> 
> When $hostname is empty, do_static() and do_ipv6auto() will return 1
> and fails to run setup_net at the last of ifup.sh
> 
> Signed-off-by: WANG Chao <chaowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  modules.d/40network/ifup.sh | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
> index 95289c9..db233de 100755
> --- a/modules.d/40network/ifup.sh
> +++ b/modules.d/40network/ifup.sh
> @@ -88,6 +88,8 @@ do_ipv6auto() {
>      wait_for_if_up $netif
>  
>      [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
> +
> +    return 0
>  }
>  
>  # Handle static ip configuration
> @@ -108,6 +110,8 @@ do_static() {
>  
>      [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
>      [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
> +
> +    return 0
>  }
>  
>  # loopback is always handled the same way
> 

https://admin.fedoraproject.org/updates/dracut-024-5.git20121019.fc18