From ec1a451c8644d6bcd9ea06a689e64ef2a41ca0c128a972a667c772af6d597c2a Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Mon, 10 Oct 2011 09:36:11 +0000
Subject: [PATCH 1/2] - cryptsetup-boot: Rescan LVM volumes after opening
 crypto (bnc#722916).

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=74
---
 boot.crypto-0_201105271519.tar.bz2 | 3 ---
 boot.crypto-0_201110101134.tar.bz2 | 3 +++
 cryptsetup.changes                 | 5 +++++
 cryptsetup.spec                    | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 boot.crypto-0_201105271519.tar.bz2
 create mode 100644 boot.crypto-0_201110101134.tar.bz2

diff --git a/boot.crypto-0_201105271519.tar.bz2 b/boot.crypto-0_201105271519.tar.bz2
deleted file mode 100644
index 656a950..0000000
--- a/boot.crypto-0_201105271519.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f89281aaea64c9562e45428b3476648491d4e3186d597001637525d95201a19
-size 17015
diff --git a/boot.crypto-0_201110101134.tar.bz2 b/boot.crypto-0_201110101134.tar.bz2
new file mode 100644
index 0000000..ca7ab64
--- /dev/null
+++ b/boot.crypto-0_201110101134.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdcb8c690f385f61c5c94c641da9e9e7c6b30a57d1104134682f119999e49dce
+size 17125
diff --git a/cryptsetup.changes b/cryptsetup.changes
index 78c00e7..41750af 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 10 00:18:10 UTC 2011 - jeffm@suse.com
+
+- cryptsetup-boot: Rescan LVM volumes after opening crypto (bnc#722916).
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:51 UTC 2011 - coolo@suse.com
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index b55b414..238cf03 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -27,7 +27,7 @@ BuildRequires:  libtool
 # hashalot version
 %define haver 0.3 
 # boot.crypto version
-%define bcver 0_201105271519
+%define bcver 0_201110101134
 License:        GPLv2+
 Group:          System/Base
 Version:        1.3.1

From 29279bfec8a0df4a00f0c32610f0a24982d4b8fa12d52540216d81d55d1d21a9 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Thu, 27 Oct 2011 15:53:38 +0000
Subject: [PATCH 2/2] - on update convert noauto to nofail and turn on fsck
 (bnc#724113)

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=75
---
 cryptsetup.changes |  5 +++++
 cryptsetup.spec    | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/cryptsetup.changes b/cryptsetup.changes
index 41750af..4ec3b97 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 27 15:53:20 UTC 2011 - lnussel@suse.de
+
+- on update convert noauto to nofail and turn on fsck (bnc#724113)
+
 -------------------------------------------------------------------
 Mon Oct 10 00:18:10 UTC 2011 - jeffm@suse.com
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 238cf03..374ac8f 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -56,6 +56,7 @@ Obsoletes:      util-linux-crypto <= 2.12r
 # we need losetup
 Requires:       util-linux
 PreReq:         %fillup_prereq %insserv_prereq
+PreReq:         coreutils diffutils
 
 %description
 cryptsetup is used to conveniently set up dm-crypt based device-mapper
@@ -166,6 +167,23 @@ if [ -e /var/run/cryptsetup.boot.crypto.enabled ]; then
 	%{fillup_and_insserv -fY boot.crypto}
 fi
 %{fillup_and_insserv boot.crypto-early}
+#
+# convert noauto to nofail and turn on fsck (bnc#724113)
+#
+marker="/var/adm/crypsetup.fstab.noauto_converted"
+if [ "$FIRST_ARG" -gt 1 -a ! -e "$marker" ]; then
+	echo "updating /etc/fstab ... "
+	tmpfstab="/etc/fstab.cryptsetup.$$"
+	sed -e '/^\/dev\/mapper\/cr_.*,noauto\s/{s/,noauto\(\s\)/,nofail\1/;s/ 0 0$/ 0 2/}' < /etc/fstab > "$tmpfstab"
+	if diff -u0 /etc/fstab "$tmpfstab"; then
+		echo "no change"
+		rm -f "$tmpfstab"
+		> "$marker"
+	else
+		cp "$tmpfstab" "$marker"
+		mv "$tmpfstab" /etc/fstab
+	fi
+fi
 
 %postun
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup