From: Sage Weil <sage@inktank.com>
Date: Sun, 27 Jan 2013 03:18:23 +0000 (-0800)
Subject: upstart: ceph-hotplug -> ceph-osd-activate
X-Git-Tag: v0.58~78^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e011ad128e7f302cb6955d9a7171ac0ec8890ddf;p=ceph.git

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 b8c80ff63d0e..4d006ce47583 100644
--- 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
index 4f1b3fc5392e..000000000000
--- 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
index 000000000000..db88f018e029
--- /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"