diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-14 21:23:22 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-14 21:23:22 +0100 |
| commit | 20379e58e404560a7fbd9eb6e299b745cdd5963f (patch) | |
| tree | b4935bd58202bbdd52488fb479fd19311e77d6a6 /src/core | |
| parent | 064846d18490cd8bbb08341c04c366fd402612eb (diff) | |
small shit and todos
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 4 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 9443282..4151c36 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -450,7 +450,7 @@ process_filesystems () } -# Roll back everything specified in $BLOCK_DATA. Doesn't restore data after you erased it, of course. +# Roll back all "filesystems" (normal ones and dm-mapper based stuff) specified in $BLOCK_DATA. Not partitions. Doesn't restore data after you erased it, of course. rollback_filesystems () { infofy "Rolling back filesystems..." disks @@ -508,7 +508,7 @@ rollback_filesystems () real_part=${part/+/} if [ "$part_type" = dm_crypt ] # Can be in use for: lvm-pv or raw. we don't need to care about raw (it will be unmounted so it can be destroyed) then - if [ -b $real_part ] && cryptsetup isLuks $real_part &>/dev/null + if [ -b $real_part ] && cryptsetup isLuks $real_part &>/dev/null #TODO: if you have lukscreated and luksopened something, isLuks still returns exitcode 234 :@ WTF then if pvdisplay $real_part >/dev/null then diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index d70d9ad..1d5f1fc 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -149,7 +149,7 @@ worker_prepare_disks() "1" "Auto-Prepare (erases the ENTIRE hard drive and sets up partitions and filesystems)" \ "2" "Partition Hard Drives" \ "3" "Configure block devices, filesystems and mountpoints" \ - "4" "Rollback last changes$rollbackstr" \ + "4" "Rollback last filesystem changes$rollbackstr" \ "5" "Return to Main Menu" case $ANSWER_OPTION in |