From fa3052040ae8124da1503cc8d14d282196ee16bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Fri, 11 Mar 2011 11:36:22 +0000
Subject: [PATCH] - rel 6; don't resolve symlink for luks device nodes

Changed files:
    geninitrd-svn.patch -> 2.4
    geninitrd.spec -> 2.180
---
 geninitrd-svn.patch | 13 +++++++++++++
 geninitrd.spec      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index 89b8106..922e7f4 100644
--- 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 d1012e6..7171bee 100644
--- 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
-- 
2.43.0