Hello community, here is the log from the commit of package cryptsetup for openSUSE:12.1 checked in at 2011-10-27 19:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/cryptsetup (Old) and /work/SRC/openSUSE:12.1/.cryptsetup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cryptsetup", Maintainer is "lnussel@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/cryptsetup/cryptsetup.changes 2011-10-24 12:34:05.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.cryptsetup.new/cryptsetup.changes 2011-10-28 15:36:37.000000000 +0200 @@ -1,0 +2,10 @@ +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). + +------------------------------------------------------------------- Old: ---- boot.crypto-0_201105271519.tar.bz2 New: ---- boot.crypto-0_201110101134.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.a1T5bT/_old 2011-10-28 15:36:40.000000000 +0200 +++ /var/tmp/diff_new_pack.a1T5bT/_new 2011-10-28 15:36:40.000000000 +0200 @@ -27,7 +27,7 @@ # 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 @@ # 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 @@ %{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 ++++++ boot.crypto-0_201105271519.tar.bz2 -> boot.crypto-0_201110101134.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201105271519/mkinitrd/boot-luks.sh new/boot.crypto-0_201110101134/mkinitrd/boot-luks.sh --- old/boot.crypto-0_201105271519/mkinitrd/boot-luks.sh 2011-05-27 15:19:38.000000000 +0200 +++ new/boot.crypto-0_201110101134/mkinitrd/boot-luks.sh 2011-10-10 11:34:41.000000000 +0200 @@ -140,4 +140,13 @@ wait_for_events fi +# Encrypted volume groups mounted by label or uuid will not +# get recognized otherwise (bnc#722916) +case "$root" in +/dev/disk/by-label/*|/dev/disk/by-uuid/*) + vgscan + vgchange -a y + ;; +esac + splash_restore -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org