|
 |
ab0e4d |
From 1651c3074f596b80478473a126c02c27398429dd Mon Sep 17 00:00:00 2001
|
|
|
ab0e4d |
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
|
ab0e4d |
Date: Thu, 18 Jul 2019 11:29:29 +0200
|
|
|
ab0e4d |
Subject: [PATCH] 95fcoe: Fix startup when fcoe module is included
|
|
|
ab0e4d |
|
|
|
ab0e4d |
The parse-fcoe.sh hook is sourced, and hence must not contain
|
|
|
ab0e4d |
exit 0 calls. Otherwise, the cmdline sequence will be interupted,
|
|
|
ab0e4d |
and no error will be reported to systemd. Use return instead.
|
|
|
ab0e4d |
|
|
|
ab0e4d |
Reference: boo#1136977
|
|
|
ab0e4d |
(cherry picked from commit 4f194276417237168f5bc929ba847a23b6a4c77f)
|
|
|
ab0e4d |
|
|
|
ab0e4d |
Resolves: #1914957
|
|
|
ab0e4d |
---
|
|
|
ab0e4d |
modules.d/95fcoe/parse-fcoe.sh | 2 +-
|
|
|
ab0e4d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ab0e4d |
|
|
|
ab0e4d |
diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
|
|
|
ab0e4d |
index 7a6ff755..8bb55c6e 100755
|
|
|
ab0e4d |
--- a/modules.d/95fcoe/parse-fcoe.sh
|
|
|
ab0e4d |
+++ b/modules.d/95fcoe/parse-fcoe.sh
|
|
|
ab0e4d |
@@ -15,7 +15,7 @@
|
|
|
ab0e4d |
|
|
|
ab0e4d |
if ! getargbool 0 rd.nofcoe ; then
|
|
|
ab0e4d |
info "rd.nofcoe=0: skipping fcoe"
|
|
|
ab0e4d |
- exit 0
|
|
|
ab0e4d |
+ return 0
|
|
|
ab0e4d |
fi
|
|
|
ab0e4d |
|
|
|
ab0e4d |
[ -z "$fcoe" ] && fcoe=$(getarg fcoe=)
|
|
|
ab0e4d |
|