From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Mar 2011 17:43:14 +0000 (-0800)
Subject: debian: add udev rules
X-Git-Tag: v0.25.1~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1d2e87019ced5bd124991cc2954044e785cde56;p=ceph.git

debian: add udev rules

Add /lib/udev/rules.d/50-rbd.rules to debian package.
crbdnamer generates the dev path:
/dev/rbd/<pool>/<name>:<number>

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

Conflicts:

	debian/rules
	src/crbdnamer
---

diff --git a/debian/rules b/debian/rules
index 1a769f768de2..6576b0db4436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ install: build
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(DESTDIR) install
-	install -D -m 644 $(CURDIR)/udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
+	install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
 
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.
diff --git a/src/crbdnamer b/src/crbdnamer
index 3bd845e3b431..4d58d39d69fe 100644
--- a/src/crbdnamer
+++ b/src/crbdnamer
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-echo -n "cat /sys/devices/rbd/$1/pool"
+echo -n `cat /sys/devices/rbd/$1/pool`
 echo -n " "
-echo -n "cat /sys/devices/rbd/$1/name"
+echo -n `cat /sys/devices/rbd/$1/name`