Author: arekm Date: Fri Mar 11 11:36:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 6; don't resolve symlink for luks device nodes
---- Files affected:
packages/geninitrd:
geninitrd-svn.patch (2.3 -> 2.4) , geninitrd.spec (2.179 -> 2.180)
---- Diffs:
================================================================
Index: packages/geninitrd/geninitrd-svn.patch
diff -u packages/geninitrd/geninitrd-svn.patch:2.3
packages/geninitrd/geninitrd-svn.patch:2.4
--- packages/geninitrd/geninitrd-svn.patch:2.3 Sun Mar 6 17:15:17 2011
+++ packages/geninitrd/geninitrd-svn.patch Fri Mar 11 12:36:22 2011
@@ -54,3 +54,16 @@
# match vendor
[ "$1" = "$vendor" ] || continue
# match device, allow PCI_ANY_ID
+Index: geninitrd
+===================================================================
+--- geninitrd (wersja 12198)
++++ geninitrd (kopia robocza)
+@@ -467,7 +467,7 @@
+ devpath=$(dm_node "$devpath")
+ fi
+
+- if [ -L "$devpath" ] && ! is_lvm "$devpath"; then
++ if [ -L "$devpath" ] && ! is_lvm "$devpath" && ! is_luks "$devpath";
then
+ # sanitize things like:
+ # /dev/block/104:2 -> /dev/cciss/c0d0p2
+ devpath=$(readlink -f "$devpath")
================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.179
packages/geninitrd/geninitrd.spec:2.180
--- packages/geninitrd/geninitrd.spec:2.179 Sun Mar 6 17:15:17 2011
+++ packages/geninitrd/geninitrd.spec Fri Mar 11 12:36:22 2011
@@ -9,7 +9,7 @@
Name: geninitrd
Version: 10000.32
# leave rel 1 for ac
-Release: 5
+Release: 6
License: GPL
Group: Applications/System
Source0: %{name}-%{version}.tar.gz
@@ -125,6 +125,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 2.180 2011/03/11 11:36:22 arekm
+- rel 6; don't resolve symlink for luks device nodes
+
Revision 2.179 2011/03/06 16:15:17 arekm
- rel 4; fix mod-sata finding too much bug
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd-svn.patch?r1=2.3&r2=2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.179&r2=2.180&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
