diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-12 18:37:37 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-12 18:37:37 +0100 |
| commit | 385dafc53c584f8b9b459cc6c95ffe5e02894efd (patch) | |
| tree | 79e345ab6369d77781751b4e1ca3b4040b5bdc39 | |
| parent | 49a78429d729a7a712eb8639d26c5b46a2795c98 (diff) | |
fix for duplicate LV's (i mean it this time) + 'umounting' of lvm pv's + small shit
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 2 | ||||
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 19c9fea..c76264a 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -391,7 +391,7 @@ process_filesystems () elif [ "$fs_mountpoint" != no_mount ] then infofy "(Maybe) Umounting $part" disks - umount $part &>/dev/null # could be that this was not mounted yet. no problem. NOTE: umount part, not mountpoint. some other part could be mounted in this place, we don't want to affect that. + umount ${part/+/} &>/dev/null # could be that this was not mounted yet. no problem. NOTE: umount part, not mountpoint. some other part could be mounted in this place, we don't want to affect that. fi done diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index de9a8a4..110df43 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -450,8 +450,8 @@ interactive_filesystems() { # a new LV must be created on this VG if interactive_filesystem $part $part_type $part_label '' then - [ -z "$fs" ] && fs=$NEW_FILESYSTEM [ -n "$fs" ] && fs="$fs|$NEW_FILESYSTEM" + [ -z "$fs" ] && fs=$NEW_FILESYSTEM fi else # an existing LV will be edited and it's settings updated @@ -480,7 +480,6 @@ interactive_filesystems() { [ -z "$part_label" ] && part_label=no_label [ -z "$fs" ] && fs=no_fs sed -i "s#^$part $part_type $part_label.*#$part $part_type $part_label $fs#" $TMP_BLOCKDEVICES # '#' is a forbidden character ! - done # Check all conditions that need to be fixed and ask the user if he wants to go back and correct them @@ -691,10 +690,10 @@ EOF fi #TODO: handle dmraid/mdadm,lvm,dm_crypt etc. replace entries where needed - # / on dm_crypt -> no substitution needed: specify physical device that hosts the encrypted / - # / on lvm - # / on lvm on dm_crypt - # / on dm_crypt on lvm + # / on dm_crypt -> no substitution needed: specify physical device that hosts the encrypted / + # / on lvm -> root=/dev/mapper/<volume-group>-<logical-volume-root> resume=/dev/mapper/<volume-group>-<logical-volume-swap> + # / on lvm on dm_crypt -> root=/dev/mapper/<volume-group>-<logical-volume-root> cryptdevice=/dev/<luks-part>:<volume-group> + # / on dm_crypt on lvm -> specify the lvm device that hosts the encrypted / # ... notify "Before installing GRUB, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install GRUB." |