diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-11 22:19:09 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-11 22:19:09 +0100 |
| commit | 2bec4454caf34832b7bd14cd8501b054b61fc962 (patch) | |
| tree | ba59e8f1a9e15796e1f778a90376230387785d68 | |
| parent | 87bee82b26ed43166133a5e0b23c3da8f40e72e3 (diff) | |
fix for dm_crypt
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 5b36aa4..3168c32 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -522,7 +522,7 @@ process_filesystem () dm_crypt) [ -z "$fs_params" ] && fs_params='-c aes-xts-plain -y -s 512'; fs_params=${fs_params//_/ } cryptsetup $fs_params $opts luksFormat -q $part >$LOG 2>&1 < /dev/tty ; ret=$? #hack to give cryptsetup the approriate stdin. keep in mind we're in a loop (see process_filesystems where something else is on stdin) - cryptsetup luksOpen $part /dev/mapper/$fs_label >$LOG 2>&1; ret=$? || ( show_warning 'cryptsetup' "Error luksOpening $part on /dev/mapper/$fs_label" ) ;; + cryptsetup luksOpen $part $fs_label >$LOG 2>&1 < /dev/tty; ret=$? || ( show_warning 'cryptsetup' "Error luksOpening $part on /dev/mapper/$fs_label" ) ;; lvm-pv) pvcreate $opts $part >$LOG 2>&1; ret=$? ;; lvm-vg) # $fs_params: ':'-separated list of PV's vgcreate $opts $_label ${fs_params//:/ } >$LOG 2>&1; ret=$? ;; |