pyrox.dev
1diff -ru LVM2.2.02.95-orig/udev/10-dm.rules.in LVM2.2.02.95/udev/10-dm.rules.in
2--- LVM2.2.02.95-orig/udev/10-dm.rules.in 2011-08-11 19:55:29.000000000 +0200
3+++ LVM2.2.02.95/udev/10-dm.rules.in 2012-03-19 20:12:35.000000000 +0100
4@@ -19,9 +19,8 @@
5 SUBSYSTEM!="block", GOTO="dm_end"
6 KERNEL!="dm-[0-9]*", GOTO="dm_end"
7
8-# Set proper sbin path, /sbin has higher priority than /usr/sbin.
9-ENV{DM_SBIN_PATH}="/sbin"
10-TEST!="$env{DM_SBIN_PATH}/dmsetup", ENV{DM_SBIN_PATH}="/usr/sbin"
11+# Set proper sbin path. Exit if dmsetup is not present.
12+ENV{DM_SBIN_PATH}="(sbindir)"
13 TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end"
14
15 # Device created, major and minor number assigned - "add" event generated.
16diff -ru LVM2.2.02.95-orig/udev/Makefile.in LVM2.2.02.95/udev/Makefile.in
17--- LVM2.2.02.95-orig/udev/Makefile.in 2012-02-24 10:53:12.000000000 +0100
18+++ LVM2.2.02.95/udev/Makefile.in 2012-03-19 20:16:09.000000000 +0100
19@@ -12,6 +12,7 @@
20 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
22 srcdir = @srcdir@
23+sbindir = @sbindir@
24 top_srcdir = @top_srcdir@
25 top_builddir = @top_builddir@
26
27@@ -26,7 +27,7 @@
28 ifeq ("@UDEV_HAS_BUILTIN_BLKID@", "yes")
29 BLKID_RULE=IMPORT{builtin}=\"blkid\"
30 else
31- BLKID_RULE=IMPORT{program}=\"\$$env{DM_SBIN_PATH}\/blkid -o udev -p \$$tempnode\"
32+ BLKID_RULE=IMPORT{program}=\"\/sbin\/blkid -o udev -p \$$tempnode\"
33 endif
34
35 CLEAN_TARGETS = 10-dm.rules 13-dm-disk.rules
36@@ -36,7 +37,7 @@
37 vpath %.rules $(srcdir)
38
39 %.rules: %.rules.in
40- $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" $< >$@
41+ $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" -e "s|(sbindir)|$(sbindir)|" $< >$@
42
43 %_install: %.rules
44 $(INSTALL_DATA) -D $< $(udevdir)/$(<F)