diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 6 |
2 files changed, 3 insertions, 4 deletions
@@ -18,7 +18,6 @@ LOCALE, HARDWARECLOCK, TIMEZONE, KEYMAP, MODULES, DAEMONS, network config? (or t * check everywhere that if users cancels something, we return 1, empty string behavior etc * dm_crypt unlock at boot is in qwerty. * after unlocking dm_crypt, FS check fails (reiserfs, must try other) -* lib-software line19: [ $mkinitcpio_exitcode -ne 0 ] unary operator expected when running automatic procedure (prolly otherwise too) * find a way to make _cli_ask_checklist still userfriendly for long lists.. maybe we should just propose/ask to use dia if the list is too long * sometimes we call die_error but we go back to the menu.. eg when we run as non-root and can't log * automatically configure grub for dm_crypt and lvm diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index e0b7ac8..974cf01 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -199,14 +199,14 @@ interactive_prepare_disks () case $ANSWER_OPTION in "1") - [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && break; + [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && continue interactive_autoprepare && NEXTITEM=5 && ret=0 && DISK_CONFIG_TYPE=auto;; #TODO: for some reason. if this completes $?=0, next item will be 1 :/ "2") - [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && break; + [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && continue interactive_partition && ret=1 && NEXTITEM=3 && DISK_CONFIG_TYPE=manual ;; "3") - [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && break; + [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && continue PARTFINISH="" interactive_filesystems && ret=0 && NEXTITEM=5 && DISK_CONFIG_TYPE=manual ;; |