diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 4 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -13,6 +13,8 @@ ALPHA PHASE: get some people to test and suggest ideas, while fixing bugs and re * lib things sometimes call die_error but we go back to the menu.. or something.. i think * test fancy dm_crypt/lvm etc setups * automatically configure grub for dm_crypt and lvm +* cannot destruct luks devices (cryptsetup isLuks exits 234 instead of 0 for the device) -> breaks rollback when you have a luks FS +* rollback sometimes loops only once (eg with lvm setup only the LV is rolled back) BETA PHASE: try to get aif on the (beta) installcd as an experimental, alternative installer. * find a way to not have to preload libs and stuff, only load them when needed. -> faster start of install program 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 |