- rel 6; don't resolve symlink for luks device nodes

Changed files:
    geninitrd-svn.patch -> 2.4
    geninitrd.spec -> 2.180

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index 89b8106c6f9055af841fa39b828a1cecc52677d7..922e7f4abcef83a3bfeecc5102cc989f9c98009b 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -54,3 +54,16 @@ Index: mod-sata.sh
                # 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")

diff --git a/geninitrd.spec b/geninitrd.spec
index d1012e69ad28c2568f0e061223115a02ef7a4f55..7171beed776b104c63342058c496081fc180d725 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -8,7 +8,7 @@ Summary(pl.UTF-8):      Narzędzie do tworzenia inicjalnego ramdysku używanego przy
 Name:          geninitrd
 Version:       10000.32
 # leave rel 1 for ac
-Release:       5
+Release:       6
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz