diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-09 16:51:53 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-09 16:51:53 +0100 |
| commit | 01c94db3783ab2fd465a6f12e9ad855786272442 (patch) | |
| tree | cbdabd45b6c5f36887f0a61a190ff053bf00ce4c | |
| parent | 38613598a5a79ee1b266918878ca7864d2f2dd05 (diff) | |
autoprepare fixes
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 10 |
1 files changed, 6 insertions, 4 deletions
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" |