Thomas Renninger
9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From 330bb44b7773c7b861a6aaa32d4524c783a162f0 Mon Sep 17 00:00:00 2001
|
|
From: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
|
|
Date: Tue, 8 Apr 2014 08:50:55 +0200
|
|
Subject: [PATCH] 40network: Fix race condition when wait for networks
|
|
|
|
If no network related params are specific, but rd.neednet=1 is set,
|
|
the default initqueue action is to wait until one of the network
|
|
interfaces is marked as setup properly.
|
|
|
|
This also help with initqueue's race condition when the network interface
|
|
shows upd late
|
|
|
|
References: bnc#866771
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/40network/net-genrules.sh | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
Index: dracut-041/modules.d/40network/net-genrules.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/40network/net-genrules.sh 2015-01-31 12:54:52.000000000 +0100
|
|
+++ dracut-041/modules.d/40network/net-genrules.sh 2015-03-17 12:38:55.044006007 +0100
|
|
@@ -96,6 +96,9 @@
|
|
cond='ACTION=="add", SUBSYSTEM=="net"'
|
|
# if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
|
|
echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
|
|
+ if [ "$NEEDNET" = "1" ]; then
|
|
+ echo "[ -f /tmp/net.*.did-setup ]" >$hookdir/initqueue/finished/wait-network.sh
|
|
+ fi
|
|
fi
|
|
|
|
# if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh
|