diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-14 19:05:09 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-14 19:05:09 +0100 |
| commit | 6229c990b0209c3585c3ca54a5a89f98bc0109c0 (patch) | |
| tree | 12bbefafcca7aae83f7d9fd5c7d1f2b83fe04c2e /src | |
| parent | c2666130a6170b7f2c4d5bd5dde64fb4035275e0 (diff) | |
syntax fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 2 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 3 |
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 0fdcb03..9f51c9a 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -665,8 +665,8 @@ process_filesystem () lvm-lv) # $fs_params = size string (eg '5G') lvcreate -L $fs_params $fs_opts -n $fs_label `sed 's#/dev/mapper/##' <<< $part` >$LOG 2>&1; ret=$? ;; #$opts is usually something like -L 10G # Strip '/dev/mapper/' part because device file may not exist. TODO: do i need to activate them? # don't handle anything else here, we will error later - BLOCK_ROLLBACK_USELESS=0 esac + BLOCK_ROLLBACK_USELESS=0 [ "$ret" -gt 0 ] && ( show_warning "process_filesystem error" "Error creating filesystem $fs_type on $part." ; return 1 ) sleep 2 fi diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 4e90854..0e4a426 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -168,7 +168,7 @@ worker_prepare_disks() interactive_filesystems && ret=0 && NEXTITEM=5 && DISK_CONFIG_TYPE=manual fi ;; - "4" + "4") if [ "$BLOCK_ROLLBACK_USELESS" = "1" ] then ask_yesno "It seems like you haven't partitioned/formatted/mounted anything yet (or rolled back already). This operation is useless (unless the installer is buggy), but it doesn't harm. Do you want to continue?" || NEXTITEM=5 @@ -182,6 +182,7 @@ worker_prepare_disks() show_warning "Rollback failed" "Rollback failed" fi fi + ;; *) DONE=1 ;; esac |