summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGabriel <g2p.code@gmail.com>2013-10-05 21:16:21 +0200
committerGabriel <g2p.code@gmail.com>2013-10-05 22:16:22 +0200
commit0c7a484a5b09d710814451c06ad30e894deb7ff5 (patch)
treea2112a892f9f11c157c6b9c4d47db4f27e6fb6d0 /Makefile
parent866e21a35d40e8c5df75cdc7146da88c17cc18d1 (diff)
udev: Fit into the standard rule sequencev1.0.2
Move the rule to run a bit later, after the standard udev rules have called blkid. Don't run blkid manually, and run probe-bcache as a fallback which can be patched out in a package that depends on util-linux 2.24+. probe-bcache: bail if libblkid finds anything Preserve our last-resort safety check here in case earlier rules fail to call blkid.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1f3caa4..b31e080 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ 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 61-bcache.rules $(DESTDIR)/lib/udev/rules.d/
+ install -m0644 69-bcache.rules $(DESTDIR)/lib/udev/rules.d/
install -m0755 bcache-register $(DESTDIR)/lib/udev/
-install -T -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
install -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
@@ -20,7 +20,8 @@ bcache-test: LDLIBS += `pkg-config --libs openssl`
make-bcache: LDLIBS += `pkg-config --libs uuid blkid`
make-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
make-bcache: bcache.o
-probe-bcache: LDLIBS += `pkg-config --libs uuid`
+probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
+probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
bcache-super-show: LDLIBS += `pkg-config --libs uuid`
bcache-super-show: CFLAGS += -std=gnu99
bcache-super-show: bcache.o