pyrox.dev
* Updated lvm2 to 2.02.95.
svn path=/nixpkgs/trunk/; revision=33277
+2
-2
pkgs/os-specific/linux/lvm2/default.nix
+2
-2
pkgs/os-specific/linux/lvm2/default.nix
+19
-30
pkgs/os-specific/linux/lvm2/purity.patch
+19
-30
pkgs/os-specific/linux/lvm2/purity.patch
···
1
-
TODO: fix path to blkid as well.
2
-
3
-
Currently we set it to /sbin/blkid because in nixos we fix a lot of references
4
-
to /sbin/blkid anyway.
5
-
6
-
diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
7
-
index 605e088..8865d54 100644
8
-
--- a/udev/10-dm.rules.in
9
-
+++ b/udev/10-dm.rules.in
10
-
@@ -19,9 +19,8 @@ KERNEL=="device-mapper", NAME="(DM_DIR)/control"
11
SUBSYSTEM!="block", GOTO="dm_end"
12
KERNEL!="dm-[0-9]*", GOTO="dm_end"
13
···
19
TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end"
20
21
# Device created, major and minor number assigned - "add" event generated.
22
-
diff --git a/udev/13-dm-disk.rules b/udev/13-dm-disk.rules
23
-
index 271ca22..cdc583f 100644
24
-
--- a/udev/13-dm-disk.rules
25
-
+++ b/udev/13-dm-disk.rules
26
-
@@ -19,7 +19,7 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
27
-
28
-
ENV{DM_SUSPENDED}=="1", GOTO="dm_end"
29
-
30
-
-IMPORT{program}="$env{DM_SBIN_PATH}/blkid -o udev -p $tempnode"
31
-
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
32
-
ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100"
33
-
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
34
-
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
35
-
diff --git a/udev/Makefile.in b/udev/Makefile.in
36
-
index 11635bb..49cf732 100644
37
-
--- a/udev/Makefile.in
38
-
+++ b/udev/Makefile.in
39
@@ -12,6 +12,7 @@
40
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
41
···
44
top_srcdir = @top_srcdir@
45
top_builddir = @top_builddir@
46
47
-
@@ -26,7 +27,7 @@ include $(top_builddir)/make.tmpl
48
vpath %.rules $(srcdir)
49
50
%.rules: %.rules.in
51
-
- $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@
52
-
+ $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s|(sbindir)|$(sbindir)|" $< >$@
53
54
%_install: %.rules
55
$(INSTALL_DATA) -D $< $(udevdir)/$(<F)
···
1
+
diff -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
···
13
TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end"
14
15
# Device created, major and minor number assigned - "add" event generated.
16
+
diff -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
···
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)