From ac7d5e9a7d8ae08aa1bf2ff7462303d40cfce6af Mon Sep 17 00:00:00 2001
From: Krzysztof Krakowiak <evil@pld-linux.org>
Date: Mon, 29 Mar 2010 20:23:20 +0000
Subject: [PATCH] - adapterized - added geninitrd-tuxonice_on_dm.patch, moving
 tuxonice script down in hierarchy, to allow tuxonice snapshot device be
 device mapper device(LUKS, LVM, dmraid)

Changed files:
    geninitrd-tuxonice_on_dm.patch -> 2.1
    geninitrd.spec -> 2.167
---
 geninitrd-tuxonice_on_dm.patch | 24 ++++++++++++++++++++++++
 geninitrd.spec                 |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 geninitrd-tuxonice_on_dm.patch

diff --git a/geninitrd-tuxonice_on_dm.patch b/geninitrd-tuxonice_on_dm.patch
new file mode 100644
index 0000000..3f376ed
--- /dev/null
+++ b/geninitrd-tuxonice_on_dm.patch
@@ -0,0 +1,24 @@
+--- geninitrd-10000.20/geninitrd.old	2010-03-29 22:12:27.115199528 +0200
++++ geninitrd-10000.20/geninitrd	2010-03-29 22:14:49.765210074 +0200
+@@ -1218,10 +1218,6 @@
+ 	initrd_gen_udev
+ fi
+ 
+-if is_yes "$USE_TUXONICE"; then
+-	initrd_gen_tuxonice
+-fi
+-
+ find_modules_uvesafb
+ initrd_gen_uvesafb
+ 
+@@ -1256,6 +1252,10 @@
+ 	initrd_gen_setrootdev
+ fi
+ 
++if is_yes "$USE_TUXONICE"; then
++	initrd_gen_tuxonice
++fi
++
+ if is_yes "$USE_SUSPEND"; then
+ 	initrd_gen_suspend
+ fi
diff --git a/geninitrd.spec b/geninitrd.spec
index 8ee4a9d..0f338f2 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -3,7 +3,7 @@ Summary(pl.UTF-8):	Narzędzie do tworzenia inicjalnego ramdysku używanego przy
 Name:		geninitrd
 Version:	10000.20
 # leave rel 1 for ac
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@ Source0:	%{name}-%{version}.tar.gz
 Patch0:		%{name}-romfs.patch
 Patch1:		%{name}-gzip-compressor.patch
 Patch2:		%{name}-scsi_sync_scan.patch
+Patch3:		%{name}-tuxonice_on_dm.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	/usr/bin/ldd
 Requires:	awk
@@ -33,8 +34,8 @@ Requires:	mdadm-initrd >= 1.12.0-1
 # otherwise LVM subsystem is automatically disabled in geninitrd
 Suggests:	lvm2-initrd
 # without this softraid installations of PLD fail
-Suggests:	mdadm-initrd >= 1.12.0-1
 Suggests:	mdadm >= 1.12.0-1
+Suggests:	mdadm-initrd >= 1.12.0-1
 %endif
 Obsoletes:	mkinitrd
 %if "%{pld_release}" == "ac"
@@ -85,6 +86,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 %patch1 -p1
 %endif
 %patch2 -p0
+%patch3 -p1
 
 %build
 %{__make}
-- 
2.43.0