diff mbox

[10/78] Fixup multipathd.socket to resolve ordering dependeny

Message ID 1426509425-15978-11-git-send-email-hare@suse.de (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show

Commit Message

Hannes Reinecke March 16, 2015, 12:35 p.m. UTC
Per default any socket file is started after /run is available,
as the socket might be placed there.
This results in a dependency cycle as multipathd requires the
socket, but the daemon should be started as early as possible,
and certainly before /run is mounted.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 multipathd/multipathd.service | 3 ++-
 multipathd/multipathd.socket  | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
index be3ba3f..1ecc151 100644
--- a/multipathd/multipathd.service
+++ b/multipathd/multipathd.service
@@ -1,8 +1,9 @@ 
 [Unit]
 Description=Device-Mapper Multipath Device Controller
 Before=iscsi.service iscsid.service lvm2-activation-early.service
-After=syslog.target
+Before=local-fs-pre.target
 DefaultDependencies=no
+Wants=multipathd.socket
 Conflicts=shutdown.target
 
 [Service]
diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
index 3d4b6da..921706d 100644
--- a/multipathd/multipathd.socket
+++ b/multipathd/multipathd.socket
@@ -1,5 +1,7 @@ 
+[Unit]
+Description=multipathd control socket
+DefaultDependencies=no
+Before=sockets.target
+
 [Socket]
 ListenStream=@/org/kernel/linux/storage/multipathd
-
-[Install]
-WantedBy=sockets.target