Accepting request 89562 from security

- on update convert noauto to nofail and turn on fsck (bnc#724113)

- cryptsetup-boot: Rescan LVM volumes after opening crypto (bnc#722916).

OBS-URL: https://build.opensuse.org/request/show/89562
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=69

boot.crypto-0_201105271519.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f89281aaea64c9562e45428b3476648491d4e3186d597001637525d95201a19
-size 17015

boot.crypto-0_201110101134.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdcb8c690f385f61c5c94c641da9e9e7c6b30a57d1104134682f119999e49dce
+size 17125

cryptsetup.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
+- cryptsetup-boot: Rescan LVM volumes after opening crypto (bnc#722916).
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:51 UTC 2011 - coolo@suse.com
 

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
@@ -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