]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
systemd/rbdmap.service: order us before remote-fs-pre.target 22769/head
authorIlya Dryomov <idryomov@gmail.com>
Thu, 28 Jun 2018 15:16:17 +0000 (17:16 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Fri, 29 Jun 2018 14:36:05 +0000 (16:36 +0200)
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>
systemd/rbdmap.service.in

index 0edf6ecc0e4264a0ea3e541007630a5dde5b8e86..4757ee6ccb29de1d892b24c26762265866ac5c5b 100644 (file)
@@ -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@