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 b/systemd/rbdmap.service
index adfcba5955d909ecd5aee7f0c1463630108c114b..66e4f653b862c7456fc80c4e561febdd472831f1 100644 (file)
--- a/systemd/rbdmap.service
+++ b/systemd/rbdmap.service
@@ -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=-/etc/sysconfig/ceph