Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at 2012-06-15 19:39:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cryptsetup (Old) and /work/SRC/openSUSE:Factory/.cryptsetup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cryptsetup", Maintainer is "lnussel@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/cryptsetup/cryptsetup.changes 2012-04-17 21:58:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cryptsetup.new/cryptsetup.changes 2012-06-15 19:39:04.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 15 12:41:00 UTC 2012 - lnussel@suse.de + +- boot.crypto: + * update man page to mention systemd and wiki article + * sanitize dm target names (bnc#716240) + +------------------------------------------------------------------- Old: ---- boot.crypto-0_201204171450.tar.bz2 New: ---- boot.crypto-0_201206151440.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.B6nRl7/_old 2012-06-15 19:39:06.000000000 +0200 +++ /var/tmp/diff_new_pack.B6nRl7/_new 2012-06-15 19:39:06.000000000 +0200 @@ -27,7 +27,7 @@ # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_201204171450 +%define bcver 0_201206151440 License: GPL-2.0+ Group: System/Base Version: 1.4.2 ++++++ boot.crypto-0_201204171450.tar.bz2 -> boot.crypto-0_201206151440.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201204171450/crypttab.5 new/boot.crypto-0_201206151440/crypttab.5 --- old/boot.crypto-0_201204171450/crypttab.5 2012-04-17 14:50:27.000000000 +0200 +++ new/boot.crypto-0_201206151440/crypttab.5 2012-06-15 14:40:42.000000000 +0200 @@ -1,22 +1,13 @@ '" t ." Title: crypttab ." Author: [see the "AUTHOR" section] -." Generator: DocBook XSL Stylesheets v1.76.1 http://docbook.sf.net/ -." Date: 11/24/2011 +." Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/ +." Date: 06/15/2012 ." Manual: Cryptsetup Manual ." Source: cryptsetup ." Language: English ." -.TH "CRYPTTAB" "5" "11/24/2011" "cryptsetup" "Cryptsetup Manual" -." ----------------------------------------------------------------- -." * Define some portability stuff -." ----------------------------------------------------------------- -." ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -." http://bugs.debian.org/507673 -." http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -." ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq (aq -.el .ds Aq ' +.TH "CRYPTTAB" "5" "06/15/2012" "cryptsetup" "Cryptsetup Manual" ." ----------------------------------------------------------------- ." * set default formatting ." ----------------------------------------------------------------- @@ -127,6 +118,8 @@ &...] .RE .SH "OPTIONS" +.sp +Note: the options listed here refer to boot&.crypto as used by sysvinit&. Systemd has a separate implementation that does not support all options&. .PP \fBcipher\fR=<cipher> .RS 4 @@ -345,7 +338,7 @@ .RE .SH "SEE ALSO" .sp -cryptsetup(8), /etc/crypttab, fstab(8) +cryptsetup(8), /etc/crypttab, fstab(8), http://en\&.opensuse\&.org/Encrypted_Filesystems .SH "AUTHOR" .sp Manual page converted to asciidoc by Michael Gebetsroither <michael&.geb@gmx&.at>&. Originally written by Bastian Kleineidam <calvin@debian&.org> for the Debian distribution of cryptsetup&. Improved by Jonas Meurer <jonas@freesources&.org>&. Modified for SUSE Linux by Ludwig Nussel <ludwig&.nussel@suse&.de>&. Parts of this manual were taken and adapted from the fstab(5) manual page&. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201204171450/crypttab.5.txt new/boot.crypto-0_201206151440/crypttab.5.txt --- old/boot.crypto-0_201204171450/crypttab.5.txt 2012-04-17 14:50:27.000000000 +0200 +++ new/boot.crypto-0_201206151440/crypttab.5.txt 2012-06-15 14:40:42.000000000 +0200 @@ -60,6 +60,10 @@ OPTIONS ------- +Note: the options listed here refer to boot.crypto as used by +sysvinit. Systemd has a separate implementation that does not +support all options. + *cipher*=<cipher>:: Encryption algorithm. See *cryptsetup -c*. Ignored for LUKS volumes. @@ -219,7 +223,7 @@ SEE ALSO -------- -cryptsetup(8), /etc/crypttab, fstab(8) +cryptsetup(8), /etc/crypttab, fstab(8), http://en.opensuse.org/Encrypted_Filesystems AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201204171450/mkinitrd/boot-luks.sh new/boot.crypto-0_201206151440/mkinitrd/boot-luks.sh --- old/boot.crypto-0_201204171450/mkinitrd/boot-luks.sh 2012-04-17 14:50:27.000000000 +0200 +++ new/boot.crypto-0_201206151440/mkinitrd/boot-luks.sh 2012-06-15 14:40:42.000000000 +0200 @@ -62,20 +62,21 @@ luks_wait_device() { local name="$1" - eval local dev=""${luks_${luks}}"" + eval local dev=""${luks_${name}}"" check_for_device "$dev" } luksopen() { local name="$1" - eval local dev=""${luks_${luks}}"" + eval local dev=""${luks_${name}}"" + eval local realname=""${luks_${name}_name}"" if luks_check_ply; then - /usr/bin/plymouth ask-for-password --prompt="Unlocking ${name} ($dev)" | /sbin/cryptsetup --tries=1 luksOpen "$dev" "$name" + /usr/bin/plymouth ask-for-password --prompt="Unlocking ${realname} ($dev)" | /sbin/cryptsetup --tries=1 luksOpen "$dev" "$realname" else - echo -e "${extd}Unlocking ${name} ($dev)${norm}" + echo -e "${extd}Unlocking ${realname} ($dev)${norm}" splash_off - /sbin/cryptsetup --tries=1 luksOpen "$dev" "$name" + /sbin/cryptsetup --tries=1 luksOpen "$dev" "$realname" fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201204171450/mkinitrd/setup-luks.sh new/boot.crypto-0_201206151440/mkinitrd/setup-luks.sh --- old/boot.crypto-0_201204171450/mkinitrd/setup-luks.sh 2012-04-17 14:50:27.000000000 +0200 +++ new/boot.crypto-0_201206151440/mkinitrd/setup-luks.sh 2012-06-15 14:40:42.000000000 +0200 @@ -50,7 +50,8 @@ continue else dbg "got $name ($physdev) from crypttab" - eval "luks_${name}_device="$physdev"" + varname=${name//[^a-zA-Z0-9_]/_} + eval "luks_${varname}_device="$physdev"" if [ -n "$keyscript" ]; then if [ "${keyscript:0:1}" != '/' ]; then keyscript="/lib/cryptsetup/scripts/$keyscript" @@ -59,9 +60,9 @@ echo "keyscript "$keyscript" must be an executable" >&2 continue fi - eval "luks_${name}_keyscript="$keyscript"" - [ -z "$keyfile" ] || eval "luks_${name}_keyfile="$keyfile"" - eval "luks_${name}_options="$options"" + eval "luks_${varname}_keyscript="$keyscript"" + [ -z "$keyfile" ] || eval "luks_${varname}_keyfile="$keyfile"" + eval "luks_${varname}_options="$options"" fi fi luks_add_device+=("/dev/mapper/$name") @@ -80,6 +81,7 @@ for bd in "${luks_add_device[@]}" $blockdev; do luks_name= luks_physdev= + varname= update_blockdev $bd if [ "$blockdriver" != "device-mapper" ]; then luks_blockdev="$luks_blockdev $bd" @@ -102,31 +104,34 @@ tmp_root_dm=1 # luks needs dm luks_name="$(dmsetup -c info -o name --noheadings -j $luks_blockmajor -m $luks_blockminor)" - if isset "luks_${luks_name}"; then + varname=${luks_name//[^a-zA-Z0-9_]/_} + if isset "luks_${varname}"; then dbg "$luks_name already handled" continue fi dbg "found name $luks_name" - if isset "luks_${luks_name}_device"; then - eval luks_physdev=$luks_${luks_name}_device + if isset "luks_${varname}_device"; then + eval luks_physdev=$luks_${varname}_device fi if [ -z "$luks_physdev" ]; then eval luks_physdev=$(beautify_blockdev ${luksbd}) || continue fi - eval luks_${luks_name}="$luks_physdev" - save_var luks_${luks_name} - save_var luks_${luks_name}_device - ! isset luks_${luks_name}_options || save_var luks_${luks_name}_options - ! isset luks_${luks_name}_keyfile || save_var luks_${luks_name}_keyfile - if isset luks_${luks_name}_keyscript; then - save_var luks_${luks_name}_keyscript - eval "keyscript="$luks_${luks_name}_keyscript"" + eval luks_${varname}="$luks_physdev" + eval luks_${varname}_name="$luks_name" + save_var luks_${varname} + save_var luks_${varname}_device + save_var luks_${varname}_name + ! isset luks_${varname}_options || save_var luks_${varname}_options + ! isset luks_${varname}_keyfile || save_var luks_${varname}_keyfile + if isset luks_${varname}_keyscript; then + save_var luks_${varname}_keyscript + eval "keyscript="$luks_${varname}_keyscript"" cryptprograms="$cryptprograms $keyscript" # hack as setup-progs.sh does not create directories (bnc#536470) mkdir -p $tmp_mnt${keyscript%/*} fi - luks="$luks $luks_name" + luks="$luks $varname" echo "enabling LUKS support for ${luks_physdev} ($luks_name)" luks_blockdev="$luks_blockdev $luksbd" done -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org