From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 28 Jun 2018 15:16:17 +0000 (+0200)
Subject: systemd/rbdmap.service: order us before remote-fs-pre.target
X-Git-Tag: v13.2.1~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fb3d1e11bab6e800087d5456108f7839e632bf0;p=ceph.git

systemd/rbdmap.service: order us before remote-fs-pre.target

If "/usr/bin/rbdmap unmap-all" notices a file system mounted on top of
an rbd device, it will call umount, interfering with systemd shutdown
logic.  Make sure we aren't invoked until all _netdev mounts are dealt
with by systemd.

Fixes: http://tracker.ceph.com/issues/24713
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 37da5d8af95f31105962b778368a515379f6d61c)
---

diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
index 0edf6ecc0e42..4757ee6ccb29 100644
--- a/systemd/rbdmap.service.in
+++ b/systemd/rbdmap.service.in
@@ -2,7 +2,8 @@
 Description=Map RBD devices
 
 After=network-online.target
-Wants=network-online.target
+Before=remote-fs-pre.target
+Wants=network-online.target remote-fs-pre.target
 
 [Service]
 EnvironmentFile=-@SYSTEMD_ENV_FILE@