udev: drop useless --mount argument to ceph-disk

It doesn't mean anything anymore; drop it.

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

diff --git a/src/ceph-disk-udev b/src/ceph-disk-udev
index ff164110b635a8bd31d13d13fe4611e7cf19f85e..885f638a1e0218956ae28c676cea74f1c824a49b 100755 (executable)
--- a/src/ceph-disk-udev
+++ b/src/ceph-disk-udev
@@ -28,7 +28,7 @@ case $ID_PART_ENTRY_TYPE in
 4fbd7e29-9d25-41b8-afd0-062c0ceff05d)
     # OSD_UUID
     # activate ceph-tagged partitions.
-    /usr/sbin/ceph-disk -v activate --mount /dev/${NAME}
+    /usr/sbin/ceph-disk -v activate /dev/${NAME}
     ;;
 
 4fbd7e29-9d25-41b8-afd0-5ec00ceff05d)
@@ -38,7 +38,7 @@ case $ID_PART_ENTRY_TYPE in
     ID_PART_ENTRY_UUID=$(/usr/sbin/sgdisk --info=${PARTNO} /dev/${PARENT_NAME} | grep "Partition unique GUID" | awk '{print $4}' | tr '[:upper:]' '[:lower:]')
     /sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/${ID_PART_ENTRY_UUID} --key-size 256 create ${ID_PART_ENTRY_UUID} /dev/${NAME}
     bash -c 'while [ ! -e /dev/mapper/${ID_PART_ENTRY_UUID} ];do sleep 1; done'
-    /usr/sbin/ceph-disk-activate --mount /dev/mapper/${ID_PART_ENTRY_UUID}
+    /usr/sbin/ceph-disk-activate /dev/mapper/${ID_PART_ENTRY_UUID}
     ;;
 
 89c57f98-2fe5-4dc0-89c1-f3ad0ceff2be)

diff --git a/udev/95-ceph-osd.rules b/udev/95-ceph-osd.rules
index 9798e648483499c4b8cb75f14abcfa19f139cd39..ec2c4a463aa43efa84a4211a65884339e91593c6 100644 (file)
--- a/udev/95-ceph-osd.rules
+++ b/udev/95-ceph-osd.rules
@@ -2,7 +2,7 @@
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
-  RUN+="/usr/sbin/ceph-disk-activate --mount /dev/$name"
+  RUN+="/usr/sbin/ceph-disk-activate /dev/$name"
 
 # activate ceph-tagged partitions
 ACTION=="add", SUBSYSTEM=="block", \
@@ -24,4 +24,4 @@ ACTION=="add" SUBSYSTEM=="block", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-5ec00ceff05d", \
   RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID} --key-size 256 create $env{ID_PART_ENTRY_UUID} /dev/$name", \
   RUN+="/bin/bash -c 'while [ ! -e /dev/mapper/$env{ID_PART_ENTRY_UUID} ];do sleep 1; done'", \
-  RUN+="/usr/sbin/ceph-disk-activate --mount /dev/mapper/$env{ID_PART_ENTRY_UUID}"
+  RUN+="/usr/sbin/ceph-disk-activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"