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
29 lines
1001 B
Diff
29 lines
1001 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 15 Sep 2020 10:47:52 +0200
|
|
Subject: [PATCH] multipathd: send "STOPPING=1" to systemd on shutdown
|
|
|
|
Inform systemd that the daemon is shutting down. See sd_notify(3).
|
|
|
|
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 53a22a43..c264351c 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -208,7 +208,9 @@ static void do_sd_notify(enum daemon_status old_state,
|
|
if (msg && !safe_sprintf(notify_msg, "STATUS=%s", msg))
|
|
sd_notify(0, notify_msg);
|
|
|
|
- if (new_state == DAEMON_IDLE && !startup_done) {
|
|
+ if (new_state == DAEMON_SHUTDOWN)
|
|
+ sd_notify(0, "STOPPING=1");
|
|
+ else if (new_state == DAEMON_IDLE && !startup_done) {
|
|
sd_notify(0, "READY=1");
|
|
startup_done = true;
|
|
}
|