Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at Thu Oct 22 12:46:23 CEST 2009. -------- --- cryptsetup/cryptsetup.changes 2009-10-08 10:56:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2009-10-20 13:35:41.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 19 14:33:57 UTC 2009 - lnussel@suse.de + +- add luks script in volumemanager stage too, this way some side + effects are avoided (bnc#547612) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- boot.crypto-0_200910071414.tar.bz2 New: ---- boot.crypto-0_200910201446.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.nU7SvL/_old 2009-10-22 12:44:22.000000000 +0200 +++ /var/tmp/diff_new_pack.nU7SvL/_new 2009-10-22 12:44:22.000000000 +0200 @@ -25,12 +25,12 @@ # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_200910071414 +%define bcver 0_200910201446 License: BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later Group: System/Base AutoReqProv: on Version: 1.0.7 -Release: 9 +Release: 10 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -205,6 +205,8 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-luks.sh /lib/mkinitrd/scripts/boot-luks.sh +/lib/mkinitrd/scripts/setup-luks2.sh +/lib/mkinitrd/scripts/setup-luks_final.sh /sbin/cryptsetup /sbin/hashalot /sbin/rccrypto ++++++ boot.crypto-0_200910071414.tar.bz2 -> boot.crypto-0_200910201446.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_200910071414/Makefile new/boot.crypto-0_200910201446/Makefile --- old/boot.crypto-0_200910071414/Makefile 2009-10-07 14:14:23.000000000 +0200 +++ new/boot.crypto-0_200910201446/Makefile 2009-10-20 14:46:48.000000000 +0200 @@ -37,7 +37,7 @@ install -m 644 /dev/null $(DESTDIR)$(sysconfdir)/cryptotab test -s $(DESTDIR)$(sysconfdir)/crypttab || \ install -m 644 /dev/null $(DESTDIR)$(sysconfdir)/crypttab - install -m 755 mkinitrd/setup-luks.sh $(DESTDIR)$(initrdscriptsdir)/setup-luks.sh + install -m 755 mkinitrd/setup-luks*.sh $(DESTDIR)$(initrdscriptsdir)/ install -m 755 mkinitrd/boot-luks.sh $(DESTDIR)$(initrdscriptsdir)/boot-luks.sh html: crypttab.5.html cryptotab.5.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_200910071414/mkinitrd/setup-luks.sh new/boot.crypto-0_200910201446/mkinitrd/setup-luks.sh --- old/boot.crypto-0_200910071414/mkinitrd/setup-luks.sh 2009-10-07 14:14:23.000000000 +0200 +++ new/boot.crypto-0_200910201446/mkinitrd/setup-luks.sh 2009-10-20 14:46:48.000000000 +0200 @@ -12,6 +12,7 @@ # search for entries that have the 'initrd' option set find_crypttab_initrd() { + luks_add_device=() test -s /etc/crypttab || return local addit extraopts keyscript @@ -72,12 +73,8 @@ find_luks_devices() { luks_blockdev= - luks_add_device=() - find_crypttab_initrd - set -- "${luks_add_device[@]}" $blockdev # bd holds the device we see the decrypted LUKS partition as - while [ "$#" -gt 0 ]; do - bd="$1"; shift + for bd in "${luks_add_device[@]}" $blockdev; do luks_name= update_blockdev $bd luks_blockmajor=$blockmajor @@ -89,13 +86,7 @@ update_blockdev $luksbd dbg -n "isLuks $luksbd ... " if ! /sbin/cryptsetup isLuks $luksbd 2>/dev/null; then - dbg -n "no" - if [ "$blockdriver" = "device-mapper" ]; then - dbg -n ", but dm, requeue" - # the block device is on dm itself - set -- "$@" "$luksbd" - fi - dbg + dbg "no" continue fi dbg "yes" @@ -131,26 +122,7 @@ blockdev="$luks_blockdev" } -if [ -x /sbin/cryptsetup -a -x /sbin/dmsetup ] ; then - find_luks_devices -fi - -if [ -n "$root_luks" ]; then - case "$LANG" in - en_*|POSIX) - # We only support english keyboard layout currently - ;; - *) - echo "Only english keyboard layout supported." - echo "Please ensure that the password is typed correctly." - luks_lang="$LANG" - ;; - esac - cryptmodules=`sed -ne '/^module/s/.*: //p' < /proc/crypto` -fi - -save_var root_luks # do we have luks? -save_var luks # which names do the luks devices have? -save_var cryptmodules # required kernel modules for crypto setup -save_var cryptprograms # keyscripts -save_var luks_lang # original language settings +find_crypttab_initrd +unset luks_add_device + +find_luks_devices diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_200910071414/mkinitrd/setup-luks2.sh new/boot.crypto-0_200910201446/mkinitrd/setup-luks2.sh --- old/boot.crypto-0_200910071414/mkinitrd/setup-luks2.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/boot.crypto-0_200910201446/mkinitrd/setup-luks2.sh 2009-10-20 14:46:48.000000000 +0200 @@ -0,0 +1,11 @@ +#!/bin/bash +# +#%stage: volumemanager +#%depends: lvm2 +# + +curscript=luks.sh # XXX: to save variables in same config file + +if use_script lvm2; then + find_luks_devices +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_200910071414/mkinitrd/setup-luks_final.sh new/boot.crypto-0_200910201446/mkinitrd/setup-luks_final.sh --- old/boot.crypto-0_200910071414/mkinitrd/setup-luks_final.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/boot.crypto-0_200910201446/mkinitrd/setup-luks_final.sh 2009-10-20 14:46:48.000000000 +0200 @@ -0,0 +1,28 @@ +#!/bin/bash +# +#%stage: boot +# + +curscript=luks.sh # XXX: to save variables in same config file + +if use_script luks; then + if [ -n "$root_luks" ]; then + case "$LANG" in + en_*|POSIX) + # We only support english keyboard layout currently + ;; + *) + echo "Only english keyboard layout supported." + echo "Please ensure that the password is typed correctly." + luks_lang="$LANG" + ;; + esac + cryptmodules=`sed -ne '/^module/s/.*: //p' < /proc/crypto` + fi + + save_var root_luks # do we have luks? + save_var luks # which names do the luks devices have? + save_var cryptmodules # required kernel modules for crypto setup + save_var cryptprograms # keyscripts + save_var luks_lang # original language settings +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org