From 01c94db3783ab2fd465a6f12e9ad855786272442 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 9 Dec 2008 16:51:53 +0100 Subject: autoprepare fixes --- src/core/libs/lib-ui-interactive.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index c64c52a..c381837 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -109,6 +109,8 @@ interactive_autoprepare() DISC=$DISCS fi + DISC=${DISC// /} # strip all whitespace. we need this for some reason.TODO: find out why + get_blockdevice_size $DISC SI FSOPTS= which `get_filesystem_program ext2` &>/dev/null && FSOPTS="$FSOPTS ext2 Ext2" @@ -152,10 +154,10 @@ interactive_autoprepare() echo "$DISC $BOOT_PART_SIZE:ext2:+ $SWAP_PART_SIZE:swap $ROOT_PART_SIZE:$FSTYPE *:$FSTYPE" > $TMP_PARTITIONS - echo "${DISC}1 raw no_label ext2;yes;/boot;target;no_opts;no_label;no_params" >$TMP_BLOCKDEVICES - echo "${DISC}2 raw no_label swap;yes;no_mountpoint;target;no_opts;no_label;no_params" >$TMP_BLOCKDEVICES - echo "${DISC}3 raw no_label $FSTYPE;yes;/;target;no_opts;no_label;no_params" >$TMP_BLOCKDEVICES - echo "${DISC}4 raw no_label $FSTYPE;yes;/home;target;no_opts;no_label;no_params" >$TMP_BLOCKDEVICES + echo "${DISC}1 raw no_label ext2;yes;/boot;target;no_opts;no_label;no_params" > $TMP_BLOCKDEVICES + echo "${DISC}2 raw no_label swap;yes;no_mountpoint;target;no_opts;no_label;no_params" >> $TMP_BLOCKDEVICES + echo "${DISC}3 raw no_label $FSTYPE;yes;/;target;no_opts;no_label;no_params" >> $TMP_BLOCKDEVICES + echo "${DISC}4 raw no_label $FSTYPE;yes;/home;target;no_opts;no_label;no_params" >> $TMP_BLOCKDEVICES process_disks || die_error "Something went wrong while partitioning" -- cgit v1.2.3-54-g00ecf