All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] network: also wait for ethernet interfaces to setup
@ 2013-08-12  8:43 WANG Chao
       [not found] ` <20130812084352.GA3445-ALckc1lQpMDv8MId6FTy5BcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: WANG Chao @ 2013-08-12  8:43 UTC (permalink / raw)
  To: Harald Hoyer, Dave Young; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA

We only wait for master interfaces for bridge/bonding/team/vlan case.
If none of these complex network is configured, we should wait for
ethernet interface (bootdev) instead.
---
 modules.d/40network/net-genrules.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index f6b7d9a..31cd1e6 100755
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -74,7 +74,13 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
         done
         echo 'LABEL="net_end"'
 
-        for iface in $MASTER_IFACES; do
+        if [ -n "$MASTER_IFACES" ]; then
+            wait_ifaces=$MASTER_IFACES
+        else
+            wait_ifaces=$IFACES
+        fi
+
+        for iface in $wait_ifaces; do
             if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
                 echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
             fi
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] network: also wait for ethernet interfaces to setup
       [not found] ` <20130812084352.GA3445-ALckc1lQpMDv8MId6FTy5BcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
@ 2013-08-13  6:22   ` Dave Young
  2013-08-16  8:20   ` Harald Hoyer
  1 sibling, 0 replies; 3+ messages in thread
From: Dave Young @ 2013-08-13  6:22 UTC (permalink / raw)
  To: WANG Chao; +Cc: Harald Hoyer, initramfs-u79uwXL29TY76Z2rM5mHXA

On 08/12/2013 04:43 PM, WANG Chao wrote:
> We only wait for master interfaces for bridge/bonding/team/vlan case.
> If none of these complex network is configured, we should wait for
> ethernet interface (bootdev) instead.
> ---
>  modules.d/40network/net-genrules.sh | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
> index f6b7d9a..31cd1e6 100755
> --- a/modules.d/40network/net-genrules.sh
> +++ b/modules.d/40network/net-genrules.sh
> @@ -74,7 +74,13 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
>          done
>          echo 'LABEL="net_end"'
>  
> -        for iface in $MASTER_IFACES; do
> +        if [ -n "$MASTER_IFACES" ]; then
> +            wait_ifaces=$MASTER_IFACES
> +        else
> +            wait_ifaces=$IFACES
> +        fi
> +
> +        for iface in $wait_ifaces; do
>              if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
>                  echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
>              fi
> 

Looks good to me, thanks for the patch.

-- 
Thanks
Dave


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] network: also wait for ethernet interfaces to setup
       [not found] ` <20130812084352.GA3445-ALckc1lQpMDv8MId6FTy5BcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
  2013-08-13  6:22   ` Dave Young
@ 2013-08-16  8:20   ` Harald Hoyer
  1 sibling, 0 replies; 3+ messages in thread
From: Harald Hoyer @ 2013-08-16  8:20 UTC (permalink / raw)
  To: WANG Chao; +Cc: Harald Hoyer, Dave Young, initramfs-u79uwXL29TY76Z2rM5mHXA

On 08/12/2013 10:43 AM, WANG Chao wrote:
> We only wait for master interfaces for bridge/bonding/team/vlan case.
> If none of these complex network is configured, we should wait for
> ethernet interface (bootdev) instead.
> ---
>  modules.d/40network/net-genrules.sh | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
> index f6b7d9a..31cd1e6 100755
> --- a/modules.d/40network/net-genrules.sh
> +++ b/modules.d/40network/net-genrules.sh
> @@ -74,7 +74,13 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
>          done
>          echo 'LABEL="net_end"'
>  
> -        for iface in $MASTER_IFACES; do
> +        if [ -n "$MASTER_IFACES" ]; then
> +            wait_ifaces=$MASTER_IFACES
> +        else
> +            wait_ifaces=$IFACES
> +        fi
> +
> +        for iface in $wait_ifaces; do
>              if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
>                  echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
>              fi
> 

Thanks!

pushed

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-08-16  8:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-12  8:43 [PATCH] network: also wait for ethernet interfaces to setup WANG Chao
     [not found] ` <20130812084352.GA3445-ALckc1lQpMDv8MId6FTy5BcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
2013-08-13  6:22   ` Dave Young
2013-08-16  8:20   ` Harald Hoyer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.