From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Wed, 2 Apr 2014 14:23:19 +0000 (+1100)
Subject: init.d: correcting rbdmap init order:
X-Git-Tag: v0.79~25^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1587%2Fhead;p=ceph.git

init.d: correcting rbdmap init order:

 * Require "$remote_fs" since it guarantees /usr availability
   (rbd executable is in /usr/bin/rbd)
 * Speed-up init.d rbd mapping on machines acting as MON/OSD
   by starting rbdmap after /init.d/ceph (when possible) and
   shutting down rbd before ceph.
 * Map rbd devices before starting X (helpful when /home is mounted from rbd).
---

diff --git a/src/init-rbdmap b/src/init-rbdmap
index 5486379f0a42..a6f47b36229d 100755
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@ -7,8 +7,11 @@
 
 ### BEGIN INIT INFO
 # Provides:          rbdmap
-# Required-Start:    $network
-# Required-Stop:     $network
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
+# Should-Start:      ceph
+# Should-Stop:       ceph
+# X-Start-Before:    $x-display-manager
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Ceph RBD Mapping