3f26422f3a
- Rename patches to match git repository:
* old: 0013-Correct-paths-for-openSUSE.patch
new: 0011-Correct-paths-for-openSUSE.patch
* old: 0014-Check-for-plymouth-lib-directories.patch
new: 0012-Check-for-plymouth-lib-directories.patch
* old: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
new: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch
* old: suse_grub_manpage.patch
new: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch
* old: replace_dhclient_with_wickedd_dhcp_supplicants.patch
new: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
* old: 0015-add-new-s390x-specific-rule-files.patch
new: 0016-Add-new-s390x-specific-rule-files.patch
* old: change_write_ifcfg_to_suse.patch
new: 0017-45ifcfg-use-distro-specific-scripts.patch
* old: dracut-fix-whitespace-add-drivers_call.patch
new: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch
* old: wait_for_network_race_condition_fix.patch
new: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
* old: dracut-warpclock_module.patch
new: 0020-00warpclock-Set-correct-timezone.patch
* old: s390-dcssblk.patch
new: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch
* old: dracut-install-persistent-rule.patch
new: 0022-95udev-rules-add-persistent-network-rule.patch
* old: dracut-really-always-add-autofs4.patch
new: 0023-systemd-always-tries-to-load-autofs4.patch
* old: mdraid-setup.patch
new: 0024-Fixup-mdraid-setup.patch
* old: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch
OBS-URL: https://build.opensuse.org/request/show/236221
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=156
37 lines
1.4 KiB
Diff
37 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(+)
|
|
|
|
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
|
|
index af2f09c..6ec9239 100755
|
|
--- a/modules.d/40network/net-genrules.sh
|
|
+++ b/modules.d/40network/net-genrules.sh
|
|
@@ -98,6 +98,9 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
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
|
|
--
|
|
1.8.1.4
|
|
|