upstart: ceph-hotplug -> ceph-osd-activate

This is a more meaningful name.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index b8c80ff63d0e58ce06c00c3a87521da42a847ce6..4d006ce47583abc1e5cd38f74b33c8e12796eb03 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1115,7 +1115,7 @@ EXTRA_DIST += \
        $(srcdir)/upstart/ceph-osd.conf \
        $(srcdir)/upstart/ceph-osd-all.conf \
        $(srcdir)/upstart/ceph-osd-all-starter.conf \
-       $(srcdir)/upstart/ceph-hotplug.conf \
+       $(srcdir)/upstart/ceph-osd-activate.conf \
        $(srcdir)/upstart/ceph-mds.conf \
        $(srcdir)/upstart/ceph-mds-all.conf \
        $(srcdir)/upstart/ceph-mds-all-starter.conf \

diff --git a/src/upstart/ceph-hotplug.conf b/src/upstart/ceph-hotplug.conf
deleted file mode 100644 (file)
index 4f1b3fc..0000000
--- a/src/upstart/ceph-hotplug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-description "Ceph hotplug"
-
-start on block-device-added \
-  DEVTYPE=partition \
-  ID_PART_ENTRY_TYPE=4fbd7e29-9d25-41b8-afd0-062c0ceff05d
-stop on runlevel [!2345]
-
-task
-instance $DEVNAME
-
-exec /usr/sbin/ceph-disk-activate --mark-init upstart --mount "$DEVNAME"

diff --git a/src/upstart/ceph-osd-activate.conf b/src/upstart/ceph-osd-activate.conf
new file mode 100644 (file)
index 0000000..db88f01
--- /dev/null
+++ b/src/upstart/ceph-osd-activate.conf
@@ -0,0 +1,11 @@
+description "Ceph OSD activate/hotplug"
+
+start on block-device-added \
+  DEVTYPE=partition \
+  ID_PART_ENTRY_TYPE=4fbd7e29-9d25-41b8-afd0-062c0ceff05d
+stop on runlevel [!2345]
+
+task
+instance $DEVNAME
+
+exec /usr/sbin/ceph-disk-activate --mark-init upstart --mount "$DEVNAME"