semikolon added

error handling of get_harddisk changed
This commit is contained in:
lars 2005-10-21 10:07:01 +00:00
parent 11d58745d4
commit 4361148abe

View file

@ -228,7 +228,7 @@ function find_harddisk()
if [ -z "$dev" ] ; then if [ -z "$dev" ] ; then
echo "no valid harddisk for initialisation found!" >>"$LOG_FILE" echo "no valid harddisk for initialisation found!" >>"$LOG_FILE"
cat /proc/partitions >>"$LOG_FILE" cat /proc/partitions >>"$LOG_FILE"
return 1 # error handling will be done by the caller
fi fi
echo -n "$dev" echo -n "$dev"
} }
@ -305,7 +305,7 @@ function init_cryptobox_part1()
log_msg "Initializing crypto partition on $device ..." log_msg "Initializing crypto partition on $device ..."
umount_crypto || true umount_crypto || true
mount | grep -q " $CONFIG_DIR " && umount "$CONFIG_DIR" || true mount | grep -q " $CONFIG_DIR " && umount "$CONFIG_DIR" || true
initial_checks "$device" || { log_msg "initial checks failed" && return 1} initial_checks "$device" || { log_msg "initial checks failed" && return 1; }
create_partitions "$device" create_partitions "$device"
create_config "$device" create_config "$device"
) >>"$LOG_FILE" 2>&1 ) >>"$LOG_FILE" 2>&1