b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
28 lines
843 B
Diff
28 lines
843 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 23 Sep 2020 18:45:51 +0200
|
|
Subject: [PATCH] multipathd: print error message if config can't be loaded
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 6b9e323e..7ab3eab8 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -3074,8 +3074,10 @@ child (__attribute__((unused)) void *param)
|
|
condlog(2, "read " DEFAULT_CONFIGFILE);
|
|
|
|
conf = load_config(DEFAULT_CONFIGFILE);
|
|
- if (!conf)
|
|
+ if (!conf) {
|
|
+ condlog(0, "failed to load configuration");
|
|
goto failed;
|
|
+ }
|
|
|
|
if (verbosity)
|
|
conf->verbosity = verbosity;
|