Thomas Renninger
d9c684105c
- 95resume: Do not resume on iSCSI devices (bsc#999663) *add 0310-95resume-Do-not-resume-on-iSCSI.patch - 95iscsi: ip=ibft is deprecated (bsc#1004437) *add 0311-95iscsi-ip-ibft-is-deprecated.patch - 40network: do not print warning about non-existing file (bsc#1004437) *add 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch - 90dmraid: do not delete partitions (bsc#998860) *add 0309-90dmraid-do-not-delete-partitions.patch - Give-persistent_policy-precedence-over-dev-mapper-names (bsc#908143) *add: 0502-persistent_device_policy_param_enhance.patch - mdadm IMSM_NO_PLATFORM workaround for kdump (bsc#975404) *add: 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch OBS-URL: https://build.opensuse.org/request/show/434686 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=268
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From cc2bdf6b3bf0fcaa6597ee652c024027da24b501 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 13 Oct 2016 10:27:57 +0200
|
|
Subject: [PATCH 3/3] 40network: Do not print message about /tmp/net.ibft0.conf
|
|
not found
|
|
|
|
We need to check if the file /tmp/net.X.conf exists before trying
|
|
to read from it; not doing so will create a warning during boot.
|
|
|
|
References: bsc#1004437
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
---
|
|
modules.d/40network/ifup.sh | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
index a4515d1..a684cba 100755
|
|
--- a/modules.d/40network/ifup.sh
|
|
+++ b/modules.d/40network/ifup.sh
|
|
@@ -506,10 +506,12 @@ for p in $(getargs ip=); do
|
|
[ "$autoconf" = "ibft" ] && continue
|
|
|
|
# skip if same configuration appears twice
|
|
- while read line
|
|
- do
|
|
- [ "$line" = "$p" ] && continue 2
|
|
- done < /tmp/net.${netif}.conf
|
|
+ if [ -f /tmp/net.${netif}.conf ] ; then
|
|
+ while read line
|
|
+ do
|
|
+ [ "$line" = "$p" ] && continue 2
|
|
+ done < /tmp/net.${netif}.conf
|
|
+ fi
|
|
|
|
echo $p >> /tmp/net.${netif}.conf
|
|
|
|
--
|
|
2.6.6
|
|
|