Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at Fri Mar 5 02:23:44 CET 2010. -------- --- cryptsetup/cryptsetup.changes 2010-02-02 13:22:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2010-03-02 13:25:29.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 2 12:02:50 UTC 2010 - lnussel@suse.de + +- boot.crypto: + * restore splash screen state after initrd prompt (bnc#559053) + * use highlighted prompt in initrd too + * fix adding volumes with initrd option (bnc#558891) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- boot.crypto-0_201002021320.tar.bz2 New: ---- boot.crypto-0_201003021301.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.VZioFS/_old 2010-03-05 02:23:36.000000000 +0100 +++ /var/tmp/diff_new_pack.VZioFS/_new 2010-03-05 02:23:36.000000000 +0100 @@ -25,12 +25,12 @@ # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_201002021320 +%define bcver 0_201003021301 License: BSD3c(or similar) ; GPLv2 ; GPLv2+ Group: System/Base AutoReqProv: on Version: 1.1.0 -Release: 2 +Release: 3 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_201002021320.tar.bz2 -> boot.crypto-0_201003021301.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201002021320/mkinitrd/boot-luks.sh new/boot.crypto-0_201003021301/mkinitrd/boot-luks.sh --- old/boot.crypto-0_201002021320/mkinitrd/boot-luks.sh 2010-02-02 13:20:40.000000000 +0100 +++ new/boot.crypto-0_201003021301/mkinitrd/boot-luks.sh 2010-03-02 13:01:05.000000000 +0100 @@ -15,6 +15,32 @@ ## luks_xxx the luks device (e.g. /dev/sda) ## +if test -t 1 -a "$TERM" != "raw" -a "$TERM" != "dumb"; then + extd="\e[1m" + norm="\e[m" +else + extd='' + norm='' +fi + +slash_read() +{ + splash="" + if test -e /proc/splash ; then + read splash < /proc/splash + fi +} + +splash_off() +{ + [ -z "$splash" ] || echo verbose > /proc/splash +} + +splash_restore() +{ + [ -z "$splash" ] || echo "$splash" > /proc/splash +} + # can't do this in luksopen as it would mix output with the # keyscript luks_wait_device() @@ -28,6 +54,8 @@ { local name="$1" eval local dev="\"\${luks_${luks}}\"" + echo -e "${extd}Unlocking ${name} ($dev)${norm}" + splash_off /sbin/cryptsetup --tries=1 luksOpen "$dev" "$name" } @@ -64,8 +92,10 @@ # devices are to be decrypted if [ -n "$reuse_pass" ]; then if [ -z "$pass" ]; then + splash_off local pass echo + echo -e "${extd}Need to unlock encrypted volumes${norm}" echo -n "Enter LUKS Passphrase: " read -s pass echo @@ -91,6 +121,8 @@ fi } +splash_read + do_luks # XXX: activate and wait for volume groups if the resume volume is @@ -103,3 +135,5 @@ done wait_for_events fi + +splash_restore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201002021320/mkinitrd/setup-luks.sh new/boot.crypto-0_201003021301/mkinitrd/setup-luks.sh --- old/boot.crypto-0_201002021320/mkinitrd/setup-luks.sh 2010-02-02 13:20:40.000000000 +0100 +++ new/boot.crypto-0_201003021301/mkinitrd/setup-luks.sh 2010-03-02 13:01:05.000000000 +0100 @@ -77,6 +77,10 @@ for bd in "${luks_add_device[@]}" $blockdev; do luks_name= update_blockdev $bd + if [ "$blockdriver" != "device-mapper" ]; then + luks_blockdev="$luks_blockdev $bd" + continue + fi luks_blockmajor=$blockmajor luks_blockminor=$blockminor dbg "finding deps of $bd ($blockmajor:$blockminor) ..." @@ -123,6 +127,5 @@ } find_crypttab_initrd -unset luks_add_device - find_luks_devices +unset luks_add_device ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org