![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package cryptsetup checked in at Fri Aug 8 17:19:07 CEST 2008. -------- --- cryptsetup/cryptsetup.changes 2008-07-23 15:44:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2008-08-08 12:16:01.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 8 11:42:10 CEST 2008 - mkoenig@suse.de + +- boot.crypto: + * Provide some reasonable exit status [bnc#409502] + +------------------------------------------------------------------- Old: ---- boot.crypto-0_200805061223.tar.bz2 New: ---- boot.crypto-0_200808081124.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.l14316/_old 2008-08-08 17:18:49.000000000 +0200 +++ /var/tmp/diff_new_pack.l14316/_new 2008-08-08 17:18:49.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package cryptsetup (Version 1.0.5_SVNr46) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,12 +24,12 @@ # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_200805061223 +%define bcver 0_200808081124 License: BSD 3-Clause; GPL v2 or later Group: System/Base AutoReqProv: on Version: 1.0.5_SVNr46 -Release: 28 +Release: 36 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -184,6 +191,9 @@ %{_libdir}/libcryptsetup.so %changelog +* Fri Aug 08 2008 mkoenig@suse.de +- boot.crypto: + * Provide some reasonable exit status [bnc#409502] * Wed Jul 23 2008 hare@suse.de - Include mkinitrd scriptlets. * Wed Jul 23 2008 mkoenig@suse.de ++++++ boot.crypto-0_200805061223.tar.bz2 -> boot.crypto-0_200808081124.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200805061223/boot.crypto new/boot.crypto-0_200808081124/boot.crypto --- old/boot.crypto-0_200805061223/boot.crypto 2008-05-06 12:23:11.000000000 +0200 +++ new/boot.crypto-0_200808081124/boot.crypto 2008-08-08 11:24:14.000000000 +0200 @@ -54,6 +54,7 @@ tostart="$2" foundit='' + failed=0 if test -s $CRYPTOTAB; then start_cryptotab @@ -65,16 +66,17 @@ test -n "$foundit" || report 6 "$tostart ..." - rc_failed 0 - restore + rc_failed $failed + cutomize_start_hook ;; stop) tostop="$2" foundit='' + failed=0 if test -s $CRYPTOTAB; then stop_cryptotab @@ -86,7 +88,7 @@ test -n "$foundit" || report 6 "$tostop ..." - rc_failed 0 + rc_failed $failed cutomize_stop_hook ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200805061223/boot.crypto-early new/boot.crypto-0_200808081124/boot.crypto-early --- old/boot.crypto-0_200805061223/boot.crypto-early 2008-05-06 12:23:11.000000000 +0200 +++ new/boot.crypto-0_200808081124/boot.crypto-early 2008-08-08 11:24:14.000000000 +0200 @@ -57,6 +57,7 @@ tostart="$2" foundit='' + failed=0 if test -s $CRYPTTAB; then start_crypttab @@ -64,16 +65,17 @@ test -n "$foundit" || report 6 "$tostart ..." - rc_failed 0 - restore + rc_failed $failed + cutomize_start_hook ;; stop) tostop="$2" foundit='' + failed=0 if test -s $CRYPTTAB; then stop_crypttab @@ -81,7 +83,7 @@ test -n "$foundit" || report 6 "$tostop ..." - rc_failed 0 + rc_failed $failed cutomize_stop_hook ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/boot.crypto-0_200805061223/boot.crypto.functions new/boot.crypto-0_200808081124/boot.crypto.functions --- old/boot.crypto-0_200805061223/boot.crypto.functions 2008-05-06 12:23:11.000000000 +0200 +++ new/boot.crypto-0_200808081124/boot.crypto.functions 2008-08-08 11:24:14.000000000 +0200 @@ -273,10 +273,12 @@ # if ! test -d $access ; then report 5 "$physdev: $access doesn't exist" + failed=1 continue fi if ! test -e $physdev ; then report 5 "$physdev doesn't exist" + failed=1 continue fi # @@ -289,6 +291,7 @@ #TODO add more algorithm or better detection *) report 2 "$physdev: unsupported algorithm \"$crypto\"" + failed=1 continue ;; esac @@ -322,6 +325,7 @@ # with e.g. cdroms for backward compatability if ! losetup $loopdev $physdev; then report 1 "$physdev..." + failed=1 continue 2 fi @@ -335,6 +339,7 @@ if test "$stat" -ne 0; then detachloopdev report 1 "$physdev..." + failed=1 continue 2 fi @@ -432,6 +437,7 @@ # make sure the keyfile exists if test -n "$keyfile" -a ! -e "$keyfile"; then report 5 "$physdev: $keyfile does not exist" + failed=1 continue fi if ! test -e $physdev ; then @@ -441,6 +447,7 @@ report 5 "$physdev does not exist" fi + failed=1 continue fi @@ -599,6 +606,7 @@ if test -z "$loopdev"; then report 1 "$physdev: failed to find a usable loop device" + failed=1 continue fi fi @@ -641,6 +649,7 @@ if test $stat -ne 0; then report 1 "$physdev... " doskip=1 + failed=1 detachloopdev break fi @@ -651,6 +660,7 @@ if test $? -ne 0; then report 1 "$physdev... " doskip=1 + failed=1 /sbin/cryptsetup remove $name detachloopdev break @@ -678,6 +688,7 @@ if test $? -ne 0; then report 1 "$phsdev: failed to create temporary file system." doskip=1 + failed=1 /sbin/cryptsetup remove $name detachloopdev break @@ -814,6 +825,7 @@ if ! umount_or_swapoff; then report 1 "$physdev..." + failed=1 continue fi @@ -821,7 +833,7 @@ fi if losetup $loopdev >/dev/null 2>&1; then - losetup -d $loopdev || rc_failed 1 + losetup -d $loopdev || { rc_failed 1; failed=1; } fi echo -n "$physdev..." @@ -869,10 +881,11 @@ if test -b "/dev/mapper/$name"; then if ! umount_or_swapoff; then report 1 "$physdev..." + failed=1 continue fi - /sbin/cryptsetup remove "$name" || rc_failed 1 + /sbin/cryptsetup remove "$name" || { rc_failed 1; failed=1; } fi # delete the loop device @@ -883,7 +896,7 @@ done < <(/sbin/losetup -a) if test -n "$loopdev" && losetup $device >/dev/null 2>&1; then - /sbin/losetup -d $device || rc_failed 1 + /sbin/losetup -d $device || { rc_failed 1; failed=1; } fi echo -n "$physdev..." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de