From 22138bec81f6278551a5a0b5c839b711818b3d35 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 7 Dec 2008 18:02:53 +0100 Subject: syntax fixes --- src/core/libs/lib-blockdevices-filesystems.sh | 4 ++-- src/core/libs/lib-ui.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index b03e2b0..5421801 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -506,8 +506,8 @@ process_filesystem () swap) mkswap $part $opts >$LOG 2>&1; ret=$? ;; dm_crypt) [ -z "$fs_params" ] && fs_params='-c aes-xts-plain -y -s 512'; fs_params=${fs_params//_/ } - cryptsetup $fs_params $opts luksFormat $part >$LOG 2>&1; ret=$? ;; - cryptsetup luksOpen $part /dev/mapper/$fs_label >$LOG 2>&1; ret=$? || ( show_warning 'cryptsetup' "Error luksOpening $part on /dev/mapper/$fs_label" ) + cryptsetup $fs_params $opts luksFormat $part >$LOG 2>&1; ret=$? + cryptsetup luksOpen $part /dev/mapper/$fs_label >$LOG 2>&1; 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=$? ;; diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index 9191998..517efe3 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -153,6 +153,7 @@ ask_datetime () # DD/MM/YYYY hh:mm:ss -> YYYY-MM-DD hh:mm:ss ( date string format, set like date -s $ANSWER_DATETIME) ANSWER_DATETIME="$(echo "$_date" "$_time" | sed 's#\(..\)/\(..\)/\(....\) \(..\):\(..\):\(..\)#\3-\2-\1 \4:\5:\6#g')" elif [ "$var_UI_TYPE" = cli ] + then ask_string "Enter date [YYYY-MM-DD hh:mm:ss]" ANSWER_DATETIME=$ANSWER_STRING fi -- cgit v1.2.3-54-g00ecf