Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at Thu Dec 2 16:01:43 CET 2010. -------- --- cryptsetup/cryptsetup.changes 2010-11-16 15:06:14.000000000 +0100 +++ cryptsetup/cryptsetup.changes 2010-11-30 16:07:41.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 30 14:16:07 UTC 2010 - lnussel@suse.de + +- boot.crypto: + * drop cryptotab support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- boot.crypto-0_201011161518.tar.bz2 New: ---- boot.crypto-0_201011301557.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.tlIhxY/_old 2010-12-02 15:58:34.000000000 +0100 +++ /var/tmp/diff_new_pack.tlIhxY/_new 2010-12-02 15:58:34.000000000 +0100 @@ -25,12 +25,12 @@ # hashalot version %define haver 0.3 # boot.crypto version -%define bcver 0_201011161518 +%define bcver 0_201011301557 License: GPLv2+ Group: System/Base AutoReqProv: on Version: 1.1.3 -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 @@ -212,6 +212,7 @@ /lib/mkinitrd/scripts/boot-luks.sh /lib/mkinitrd/scripts/setup-luks2.sh /lib/mkinitrd/scripts/setup-luks_final.sh +/usr/sbin/convert_cryptotab /sbin/cryptsetup /sbin/hashalot /sbin/rccrypto ++++++ boot.crypto-0_201011161518.tar.bz2 -> boot.crypto-0_201011301557.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/Makefile new/boot.crypto-0_201011301557/Makefile --- old/boot.crypto-0_201011161518/Makefile 2010-11-16 15:18:55.000000000 +0100 +++ new/boot.crypto-0_201011301557/Makefile 2010-11-30 15:57:11.000000000 +0100 @@ -3,6 +3,7 @@ mandir=/usr/share/man sysconfdir=/etc initrdscriptsdir=/lib/mkinitrd/scripts +sbindir=/usr/sbin ASCIIDOC=asciidoc @@ -23,6 +24,7 @@ $(ASCIIDOC) cryptotab.5.txt install: crypttab.5 cryptotab.5 + install -d -m 755 $(DESTDIR)$(sbindir) install -d -m 755 $(DESTDIR)$(initrdscriptsdir) install -d -m 755 $(DESTDIR)$(initscriptdir) install -d -m 755 $(DESTDIR)$(pkglibdir)/checks @@ -39,6 +41,7 @@ install -m 644 /dev/null $(DESTDIR)$(sysconfdir)/crypttab install -m 755 mkinitrd/setup-luks*.sh $(DESTDIR)$(initrdscriptsdir)/ install -m 755 mkinitrd/boot-luks.sh $(DESTDIR)$(initrdscriptsdir)/boot-luks.sh + install -m 755 convert_cryptotab $(DESTDIR)$(sbindir) html: crypttab.5.html cryptotab.5.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/boot.crypto new/boot.crypto-0_201011301557/boot.crypto --- old/boot.crypto-0_201011161518/boot.crypto 2010-11-16 15:18:55.000000000 +0100 +++ new/boot.crypto-0_201011301557/boot.crypto 2010-11-30 15:57:11.000000000 +0100 @@ -46,7 +46,7 @@ rc_reset -if test ! -s $CRYPTOTAB -a ! -s $CRYPTTAB; then +if test ! -s $CRYPTTAB; then report 6 "no crypto partitions configured" rc_exit fi @@ -65,8 +65,10 @@ foundit='' failed=0 - if test -s $CRYPTOTAB; then - start_cryptotab + if test -s /etc/cryptotab; then + echo -n "/etc/cryptotab is no longer supported!" + rc_failed 3 + rc_status -v fi if test -s $CRYPTTAB; then @@ -89,10 +91,6 @@ customize_pre_stop_hook - if test -s $CRYPTOTAB; then - stop_cryptotab - fi - if test -s $CRYPTTAB; then stop_crypttab fi @@ -108,10 +106,6 @@ tostatus="$2" foundit='' - if test -s $CRYPTOTAB; then - status_cryptotab - fi - if test -s $CRYPTTAB; then status_crypttab fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/boot.crypto-early new/boot.crypto-0_201011301557/boot.crypto-early --- old/boot.crypto-0_201011161518/boot.crypto-early 2010-11-16 15:18:55.000000000 +0100 +++ new/boot.crypto-0_201011301557/boot.crypto-early 2010-11-30 15:57:11.000000000 +0100 @@ -97,10 +97,6 @@ tostatus="$2" foundit='' - if test -s $CRYPTOTAB; then - status_cryptotab - fi - if test -s $CRYPTTAB; then status_crypttab fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/boot.crypto.functions new/boot.crypto-0_201011301557/boot.crypto.functions --- old/boot.crypto-0_201011161518/boot.crypto.functions 2010-11-16 15:18:55.000000000 +0100 +++ new/boot.crypto-0_201011301557/boot.crypto.functions 2010-11-30 15:57:11.000000000 +0100 @@ -26,7 +26,6 @@ link=${base#*[SK][0-9][0-9]} # Redirect to real device (e.g. in case of boot logging) -: ${CRYPTOTAB:=/etc/cryptotab} : ${CRYPTTAB:=/etc/crypttab} # wait indefinitely in 2nd stage install to have a complete system @@ -288,32 +287,38 @@ eval "$var=\"$dev\"" } -start_cryptotab () +# options are alreay parsed so we ignore the option parmeter ($2) +keyscript_hashalot() { - local stat=0 - local haveone='' - timeout="$TIMEOUT" + local args="${hashalot_algo:+$hashalot_algo} -t $timeout ${pseed:+-s $pseed} ${itercountk:+-C $itercountk}" + if test -n "$1"; then + /sbin/hashalot $args < $1 + else + /sbin/hashalot $args + fi +} + +convert_cryptotab () +{ + : ${CRYPTOTAB:=/etc/cryptotab} + local _crypttab=() + local _fstab=() + + if [ ! -s $CRYPTOTAB ]; then + echo "You don't have $CRYPTOTAB! Nothing to do :-)" + return 0 + fi + + local cnt=0 + local line - test -n "$tostart" || echo "Activating crypto devices using $CRYPTOTAB ... " while read loopdev physdev access filesys crypto mopt info rest ; do case "$loopdev" in \#*|"") continue ;; esac - name="${loopdev#/dev/}" - name="cryptotab_${name//[^A-Za-z0-9]/_}" - - if test -n "$tostart" \ - -a "$loopdev" != "$tostart" \ - -a "$physdev" != "$tostart" \ - -a "$name" != "$tostart" \ - -a "/dev/mapper/$name" != "$tostart" \ - -a "$access" != "$tostart"; then - continue - fi - - haveone=1 - + name="cryptotab$cnt" + makeabsolute physdev # key length for cryptsetup @@ -322,22 +327,6 @@ hashalgo='sha512' # - # Does the user want to skip current entry? - # - doskip=0 - # - # Does the mount point exit? - # - 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 # # Seeking for crypto modules # @@ -347,116 +336,38 @@ twofish[0-9]*) keylen=${crypto#twofish}; ;; #TODO add more algorithm or better detection *) - report 2 "$physdev: unsupported algorithm \"$crypto\"" - failed=1 + echo "$physdev: unsupported algorithm \"$crypto\"" continue ;; esac cipher=twofish-cbc-$ivgen - if [ -e "/dev/mapper/$name" ]; then - report 5 "$physdev: $name already mapped" - continue - fi - - while true; do # setup/check loop - # - # Restore virgin state - # - if [ -b "/dev/mapper/$name" ]; then - /sbin/cryptsetup remove $name || true - fi - detachloopdev - device="$loopdev" - - # - # Setting up loop device - # - if test -n "$info" ; then - local prmt="${extd}Unlocking \"$info\" ($physdev)${norm}" - else - local prmt="${extd}Unlocking $physdev${norm}" - fi - - # we always use a loop device to avoid block size issues - # with e.g. cdroms for backward compatability - if ! losetup $loopdev $physdev; then - report 1 "$physdev..." - failed=1 - continue 2 - fi - - local params="-t $timeout -c $cipher -s $keylen -h $hashalgo" - - setprompt "$prmt" - /sbin/cryptsetup $params create "$name" "$device" < $REDIRECT > $REDIRECT 2>&1 - stat=$? - unsetprompt - - if test "$stat" -ne 0; then - detachloopdev - report 1 "$physdev..." - failed=1 - continue 2 - fi - - device="/dev/mapper/$name" - - paranoid_safety_checks "$filesys" "$device" "$access" "$physdev" - stat="$?" - if test "$stat" = 1; then # retype passphrase - continue - elif test "$stat" = 2; then # skip entry - doskip=1 - fi - break - done - # - # Does the user want to skip this entry? - # - if test $doskip -gt 0 ; then - /sbin/cryptsetup remove $name || true - report 5 "$physdev..." - detachloopdev - continue - fi - - if ! run_fsck "$filesys" "$device" "$access" "$physdev"; then - report 1 "$physdev..." - continue - fi - case "$mopt" in - default|"") mopt="" ;; + default|"") mopt="nofail" ;; + *nofail*) ;; + *) mopt="$mopt,nofail";; esac - mount -t $filesys ${mopt:+-o $mopt} $device $access - stat=$? - if test $stat -gt 0 ; then - stat=1 - /sbin/cryptsetup remove $name || true - detachloopdev - fi - report $stat "$physdev..." + _crypttab+=("$name $physdev none cipher=$cipher,hash=$hashalgo,size=$keylen,timeout=$TIMEOUT") + _fstab+=("/dev/mapper/$name $access $filesys $mopt 0 2") + : $((++cnt)) done < $CRYPTOTAB - if test -z "$haveone" -a -z "$tostart"; then - rc_failed 6 - rc_status -v1 + if [ -z "$_crypttab" ]; then + echo "nothing to do" + return 0; fi - test -z "$haveone" || foundit="$haveone" -} + echo "### put the following lines in /etc/crypttab:" + for line in "${_crypttab[@]}"; do + echo "$line" + done -# options are alreay parsed so we ignore the option parmeter ($2) -keyscript_hashalot() -{ - local args="${hashalot_algo:+$hashalot_algo} -t $timeout ${pseed:+-s $pseed} ${itercountk:+-C $itercountk}" - if test -n "$1"; then - /sbin/hashalot $args < $1 - else - /sbin/hashalot $args - fi + echo + echo "### put the following lines in /etc/fstab:" + for line in "${_fstab[@]}"; do + echo "$line" + done } start_crypttab () @@ -919,60 +830,6 @@ } -stop_cryptotab () -{ - local haveone='' - - test -n "$tostop" || echo "Turning off crypto devices using $CRYPTOTAB ... " - - while read loopdev physdev access filesys crypto mopt rest ; do - case "$loopdev" in - \#*|"") continue ;; - esac - - name="${loopdev#/dev/}" - name="cryptotab_${name//[^A-Za-z0-9]/_}" - - if test -n "$tostop" \ - -a "$loopdev" != "$tostop" \ - -a "$physdev" != "$tostop" \ - -a "$name" != "$tostop" \ - -a "/dev/mapper/$name" != "$tostop" \ - -a "$access" != "$tostop"; then - continue - fi - - haveone=1 - - makeabsolute physdev - - if test -b "/dev/mapper/$name"; then - - if ! umount_or_swapoff; then - report 1 "$physdev..." - failed=1 - continue - fi - - cryptsetup remove "$name" || rc_failed 1 - fi - - if losetup $loopdev >/dev/null 2>&1; then - losetup -d $loopdev || { rc_failed 1; failed=1; } - fi - - echo -n "$physdev..." - rc_status -v - - done < <(reverse < $CRYPTOTAB) - - if test -z "$haveone" -a -z "$tostop"; then - rc_status -v1 - fi - - test -z "$haveone" || foundit="$haveone" -} - stop_crypttab () { local haveone='' @@ -1039,68 +896,6 @@ fi test -z "$haveone" || foundit="$haveone" -} - -status_cryptotab() -{ - local state str - local haveone='' - while read loopdev physdev access filesys crypto mopt info rest ; do - case "$loopdev" in - \#*|"") continue ;; - esac - - if test -n "$tostatus" \ - -a "$loopdev" != "$tostatus" \ - -a "$physdev" != "$tostatus" \ - -a "$access" != "$tostatus"; then - continue - fi - - haveone=1 - - makeabsolute physdev - - name="${loopdev#/dev/}" - name="cryptotab_${name//[^A-Za-z0-9]/_}" - - echo -n "$physdev" - state=0 - str='' - - if losetup "$loopdev" > /dev/null 2>&1; then - str="$str ${loopdev#/dev/}" - state=$((state+1)) - fi - if test -b "/dev/mapper/$name"; then - str="$str mapped" - state=$((state+1)) - fi - if /bin/grep -q "^/dev/mapper/$name[ \t]" /proc/mounts; then - str="$str mounted" - state=$((state+1)) - fi - - if test "$state" = 3; then - rc_failed 0 - elif test "$state" != 0; then - rc_failed 4 - else - rc_failed 3 - fi - - if test -n "$str"; then - echo -n " [$str ]" - fi - rc_status -v - - done < $CRYPTOTAB - - if test -z "$haveone" -a -z "$tostatus"; then - report 3 "$CRYPTOTAB" - fi - - test -z "$haveone" || foundit="$haveone" } status_crypttab() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/convert_cryptotab new/boot.crypto-0_201011301557/convert_cryptotab --- old/boot.crypto-0_201011161518/convert_cryptotab 1970-01-01 01:00:00.000000000 +0100 +++ new/boot.crypto-0_201011301557/convert_cryptotab 2010-11-30 15:57:11.000000000 +0100 @@ -0,0 +1,4 @@ +#!/bin/bash +. /lib/cryptsetup/boot.crypto.functions + +convert_cryptotab "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/cryptotab.5 new/boot.crypto-0_201011301557/cryptotab.5 --- old/boot.crypto-0_201011161518/cryptotab.5 2010-11-16 15:18:55.000000000 +0100 +++ new/boot.crypto-0_201011301557/cryptotab.5 2010-11-30 15:57:11.000000000 +0100 @@ -1,161 +1,13 @@ +'\" t .\" Title: cryptotab .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 http://docbook.sf.net/ -.\" Date: 03/31/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/ +.\" Date: 11/30/2010 .\" Manual: Cryptsetup Manual .\" Source: cryptsetup .\" Language: English .\" -.TH "CRYPTOTAB" "5" "03/31/2009" "cryptsetup" "Cryptsetup Manual" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "CRYPTOTAB" "5" "11/30/2010" "cryptsetup" "Cryptsetup Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,9 +18,9 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" cryptotab \- static information about crypted filesystems (deprecated) -.SH "Synopsis" +.SH "SYNOPSIS" .PP \fBcryptotab\fR .RS 4 @@ -182,105 +34,64 @@ \fIINFO\fR]] .RE .SH "DESCRIPTION" -.if n \{\ -.sp -.\} -.RS 4 -.BM yellow -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBNote\fR -.ps -1 -.br -.sp -\fB/etc/cryptotab\fR was designed for use with the now deprecated cryptoloop technology and must therefore be considered deprecated as well\&. \fB/etc/crypttab\fR (note the missing \(lqo\(rq) should be used instead\&. -.sp .5v -.EM yellow -.RE .sp The file \fB/etc/cryptotab\fR contains descriptive informations about encrypted volumes\&. Each volume is described on a separate line; columns on each line are separated by tabs or spaces\&. Lines starting with "\fI#\fR" are comments, empty lines are ignored\&. The order of records in \fBcryptotab\fR is important because the \fB/etc/init\&.d/boot\&.crypto\fR script sequentially iterates through \fBcryptotab\fR entries\&. -.TS -tab(:); -lt lt -lt lt -lt lt -lt lt -lt lt -lt lt -lt lt. -T{ -.sp +.PP \fILOOPDEVICE\fR -T}:T{ -.sp -specifies the loop device to use for this mapping, for example \FC/dev/loop0\F[] -T} -T{ -.sp +.RS 4 +specifies the loop device to use for this mapping, for example +/dev/loop0 +.RE +.PP \fIDEVICE\fR -T}:T{ -.sp +.RS 4 specifies the block special device that holds the encrypted data -T} -T{ -.sp +.RE +.PP \fIMOUNTPOINT\fR -T}:T{ -.sp +.RS 4 specifies the where the volume should be mounted -T} -T{ -.sp +.RE +.PP \fIFILESYSTEM\fR -T}:T{ -.sp +.RS 4 specifies the file system of the volume -T} -T{ -.sp +.RE +.PP \fIALGORITHM\fR -T}:T{ -.sp +.RS 4 specifies the encryption algorithm to use .sp -Supported algorithms are \fItwofish\fR, \fItwofishSL92\fR and \fItwofish256\fR -T} -T{ -.sp +Supported algorithms are +\fItwofish\fR, +\fItwofishSL92\fR +and +\fItwofish256\fR +.RE +.PP \fIMOUNTOPTIONS\fR -T}:T{ -.sp +.RS 4 optionally specifies mount option -T} -T{ -.sp +.RE +.PP \fIINFO\fR -T}:T{ -.sp +.RS 4 optionally specifies a string that should be printed when prompting for the passphrase -T} -.TE -.sp 1 +.RE .SH "EXAMPLES" .sp .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.BB lightgray /dev/loop0 /dev/sda6 /secret ext2 twofish256 -.EB lightgray .fi -.fam -.ps +1 .if n \{\ .RE .\} +.SH "BUGS" +.sp +\fB/etc/cryptotab\fR was designed for use with the deprecated cryptoloop technology and is no longer supported\&. This manual only exists for reference\&. Use \fB/etc/crypttab\fR (note the missing \(lqo\(rq) instead\&. The script \fBconvert_cryptotab\fR may help with this task\&. .SH "SEE ALSO" .sp cryptsetup(8), /etc/crypttab, mount(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boot.crypto-0_201011161518/cryptotab.5.txt new/boot.crypto-0_201011301557/cryptotab.5.txt --- old/boot.crypto-0_201011161518/cryptotab.5.txt 2010-11-16 15:18:55.000000000 +0100 +++ new/boot.crypto-0_201011301557/cryptotab.5.txt 2010-11-30 15:57:11.000000000 +0100 @@ -16,15 +16,6 @@ DESCRIPTION ----------- - -[NOTE] -=========== -*/etc/cryptotab* was designed for use with the now -deprecated cryptoloop technology and must therefore be considered -deprecated as well. */etc/crypttab* (note the missing ``o'') should be -used instead. -=========== - The file */etc/cryptotab* contains descriptive informations about encrypted volumes. Each volume is described on a separate line; columns on each line are separated by tabs or spaces. Lines starting @@ -59,6 +50,14 @@ /dev/loop0 /dev/sda6 /secret ext2 twofish256 ......... +BUGS +---- +*/etc/cryptotab* was designed for use with the +deprecated cryptoloop technology and is no longer supported. This manual only +exists for reference. Use +*/etc/crypttab* (note the missing ``o'') instead. The script *convert_cryptotab* may help with this task. + + SEE ALSO -------- cryptsetup(8), /etc/crypttab, mount(8) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org