diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-07 18:02:53 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-07 18:02:53 +0100 |
| commit | 22138bec81f6278551a5a0b5c839b711818b3d35 (patch) | |
| tree | c85b123b710c148f427ab34ba09eff49d7c1a871 /src | |
| parent | 15b4f74b63f636693c71c658866d43fa070c8f9f (diff) | |
syntax fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 4 | ||||
| -rw-r--r-- | src/core/libs/lib-ui.sh | 1 |
2 files changed, 3 insertions, 2 deletions
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 |