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
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
