public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated lvm2 to 2.02.95.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33277
This commit is contained in:
Eelco Dolstra
2012-03-19 19:34:34 +00:00
parent 0d90c06ba1
commit 2199d375a2
2 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/lvm2/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, udev }: { stdenv, fetchurl, pkgconfig, udev }:
let let
v = "2.02.87"; v = "2.02.95";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz"; url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
sha256 = "04d605dac9r0yz9khx9pq6a8jdsf9arda2rz1a2d1qr3jhlw4kvg"; sha256 = "09cixpdrbzjybf8k8f0rsgkriyvbaj2acmfsg1bzxnjil4vayd83";
}; };
configureFlags = configureFlags =
pkgs/os-specific/linux/lvm2/purity.patch
+19 -30
View File
@@ -1,13 +1,7 @@
TODO: fix path to blkid as well. diff -ru LVM2.2.02.95-orig/udev/10-dm.rules.in LVM2.2.02.95/udev/10-dm.rules.in
--- LVM2.2.02.95-orig/udev/10-dm.rules.in 2011-08-11 19:55:29.000000000 +0200
Currently we set it to /sbin/blkid because in nixos we fix a lot of references +++ LVM2.2.02.95/udev/10-dm.rules.in 2012-03-19 20:12:35.000000000 +0100
to /sbin/blkid anyway. @@ -19,9 +19,8 @@
diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
index 605e088..8865d54 100644
--- a/udev/10-dm.rules.in
+++ b/udev/10-dm.rules.in
@@ -19,9 +19,8 @@ KERNEL=="device-mapper", NAME="(DM_DIR)/control"
SUBSYSTEM!="block", GOTO="dm_end" SUBSYSTEM!="block", GOTO="dm_end"
KERNEL!="dm-[0-9]*", GOTO="dm_end" KERNEL!="dm-[0-9]*", GOTO="dm_end"
@@ -19,23 +13,9 @@ index 605e088..8865d54 100644
TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end" TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end"
# Device created, major and minor number assigned - "add" event generated. # Device created, major and minor number assigned - "add" event generated.
diff --git a/udev/13-dm-disk.rules b/udev/13-dm-disk.rules diff -ru LVM2.2.02.95-orig/udev/Makefile.in LVM2.2.02.95/udev/Makefile.in
index 271ca22..cdc583f 100644 --- LVM2.2.02.95-orig/udev/Makefile.in 2012-02-24 10:53:12.000000000 +0100
--- a/udev/13-dm-disk.rules +++ LVM2.2.02.95/udev/Makefile.in 2012-03-19 20:16:09.000000000 +0100
+++ b/udev/13-dm-disk.rules
@@ -19,7 +19,7 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
ENV{DM_SUSPENDED}=="1", GOTO="dm_end"
-IMPORT{program}="$env{DM_SBIN_PATH}/blkid -o udev -p $tempnode"
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
diff --git a/udev/Makefile.in b/udev/Makefile.in
index 11635bb..49cf732 100644
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -44,12 +24,21 @@ index 11635bb..49cf732 100644
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
@@ -26,7 +27,7 @@ include $(top_builddir)/make.tmpl @@ -26,7 +27,7 @@
ifeq ("@UDEV_HAS_BUILTIN_BLKID@", "yes")
BLKID_RULE=IMPORT{builtin}=\"blkid\"
else
- BLKID_RULE=IMPORT{program}=\"\$$env{DM_SBIN_PATH}\/blkid -o udev -p \$$tempnode\"
+ BLKID_RULE=IMPORT{program}=\"\/sbin\/blkid -o udev -p \$$tempnode\"
endif
CLEAN_TARGETS = 10-dm.rules 13-dm-disk.rules
@@ -36,7 +37,7 @@
vpath %.rules $(srcdir) vpath %.rules $(srcdir)
%.rules: %.rules.in %.rules: %.rules.in
- $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@ - $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" $< >$@
+ $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s|(sbindir)|$(sbindir)|" $< >$@ + $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" -e "s|(sbindir)|$(sbindir)|" $< >$@
%_install: %.rules %_install: %.rules
$(INSTALL_DATA) -D $< $(udevdir)/$(<F) $(INSTALL_DATA) -D $< $(udevdir)/$(<F)