summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel <g2p.code@gmail.com>2013-10-06 11:07:20 +0200
committerGabriel <g2p.code@gmail.com>2013-10-06 17:35:59 +0200
commit86ba62c6a19a7ebb1e672a668ce991fb940c415d (patch)
treef0818a4da51c64cfea1a95d33f77b5c95eb743c0
parent0c7a484a5b09d710814451c06ad30e894deb7ff5 (diff)
Move probe-bcache to UDEVLIBDIR
-rw-r--r--69-bcache.rules2
-rw-r--r--Makefile6
-rwxr-xr-xinitramfs/hook2
3 files changed, 5 insertions, 5 deletions
diff --git a/69-bcache.rules b/69-bcache.rules
index 3f89b12..9445f73 100644
--- a/69-bcache.rules
+++ b/69-bcache.rules
@@ -11,7 +11,7 @@ ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found"
ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end"
# Backing devices: scan, symlink, register
-IMPORT{program}="/sbin/probe-bcache -o udev $tempnode"
+IMPORT{program}="probe-bcache -o udev $tempnode"
ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
diff --git a/Makefile b/Makefile
index b31e080..a317930 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
PREFIX=/usr
+UDEVLIBDIR=/lib/udev
CFLAGS+=-O2 -Wall -g
all: make-bcache probe-bcache bcache-super-show
install: make-bcache probe-bcache bcache-super-show
install -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
- install -m0755 probe-bcache $(DESTDIR)/sbin/
- install -m0644 69-bcache.rules $(DESTDIR)/lib/udev/rules.d/
- install -m0755 bcache-register $(DESTDIR)/lib/udev/
+ install -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
+ install -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
-install -T -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
install -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
# install -m0755 bcache-test $(DESTDIR)${PREFIX}/sbin/
diff --git a/initramfs/hook b/initramfs/hook
index 5890fe2..e618e1a 100755
--- a/initramfs/hook
+++ b/initramfs/hook
@@ -18,5 +18,5 @@ esac
cp -pt "${DESTDIR}/lib/udev/rules.d" /lib/udev/rules.d/69-bcache.rules
copy_exec /lib/udev/bcache-register
-copy_exec /sbin/probe-bcache
+copy_exec /lib/udev/probe-bcache
manual_add_modules bcache