Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at Wed Feb 2 01:34:54 CET 2011. -------- --- cryptsetup/cryptsetup.changes 2010-12-20 14:44:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2011-01-31 16:33:35.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 31 15:32:57 UTC 2011 - lnussel@suse.de + +- boot.crypto: + * don't fail if loop module is not loaded + * adapt to new crypsetup exit codes (bnc#667931) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- boot.crypto-0_201011301557.tar.bz2 New: ---- boot.crypto-0_201101311632.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.2rv8tA/_old 2011-02-02 01:34:35.000000000 +0100 +++ /var/tmp/diff_new_pack.2rv8tA/_new 2011-02-02 01:34:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package cryptsetup (Version 1.2.0) +# spec file for package cryptsetup # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,12 +25,12 @@ # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_201011301557 +%define bcver 0_201101311632 License: GPLv2+ Group: System/Base AutoReqProv: on Version: 1.2.0 -Release: 1 +Release: 2 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2.asc ++++++ boot.crypto-0_201011301557.tar.bz2 -> boot.crypto-0_201101311632.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011301557/boot.crypto.functions new/boot.crypto-0_201101311632/boot.crypto.functions --- old/boot.crypto-0_201011301557/boot.crypto.functions 2010-11-30 15:57:11.000000000 +0100 +++ new/boot.crypto-0_201101311632/boot.crypto.functions 2011-01-31 16:32:32.000000000 +0100 @@ -592,9 +592,12 @@ continue fi - unset loopsize - read loopsize < /sys/block/${dev#/dev/}/size - if test $? -eq 0 -a "$loopsize" = '0' && /sbin/losetup $param_ro "$dev" $device; then + loopsize=0 + p=/sys/block/${dev#/dev/}/size + if [ -e "$p" ]; then # doesn't exist if loop module not loaded + read loopsize < "$p" + fi + if test "$loopsize" = '0' && /sbin/losetup $param_ro "$dev" $device; then device="$dev" loopdev="$device" break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011301557/mkinitrd/boot-luks.sh new/boot.crypto-0_201101311632/mkinitrd/boot-luks.sh --- old/boot.crypto-0_201011301557/mkinitrd/boot-luks.sh 2010-11-30 15:57:11.000000000 +0100 +++ new/boot.crypto-0_201101311632/mkinitrd/boot-luks.sh 2011-01-31 16:32:32.000000000 +0100 @@ -65,9 +65,9 @@ check_retry() { - # return value != 255 means some error with getting the key, + # return value != 2 means some error with getting the key, # like timeout or ^d. No retry in that case. - [ "$1" -ne 0 -a "$1" -eq 255 ] + [ "$1" -ne 0 -a "$1" -eq 2 ] } do_luks() { @@ -76,8 +76,8 @@ # We only support english keyboard layout ;; *) - echo "Only english keyboard layout supported." - echo "Please ensure that the password is typed correctly." + echo "*** Note: only US keyboard layout is supported." + echo "*** Please ensure that the password is typed correctly." ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org