diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 9 |
2 files changed, 8 insertions, 4 deletions
@@ -18,7 +18,6 @@ should keep working fine needed. -> faster start of install program Specifically: -* core/interactive bug: boot space 15 -> too large should be too small * core/interactive bug: swap space 0 -> invalid? * core/interactive: keymap setting from installer does not go in $target/etc/rc.conf * core/interactive: try out different installation methods @@ -42,6 +41,8 @@ it can't kill the process or something... * core/interactive should mount all target fs's into /mnt (eg /mnt/home is not mounted). Maybe not needed, but can be useful for other people who want to inject some stuff into the installer +* core/interactive: do not check hard for the dependencies. a user could really know what he's doing or need to reboot after partitioning a disk and +skip that check or something. Alternatively, maybe just show which steps are done successfully in the main menu PRODUCTION PHASE: be the primary installer. deprecate /arch/setup and /arch/quickinst * fix everything even more diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 4c0f8e8..a639214 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -97,8 +97,8 @@ interactive_set_clock() HARDWARECLOCK=$ANSWER_OPTION # timezone? - tzselect > $ANSWER || return 1 - TIMEZONE=$(cat $ANSWER) + TIMEZONE=`tzselect` || return 1 + # set system clock from hwclock - stolen from rc.sysinit local HWCLOCK_PARAMS="" @@ -159,8 +159,11 @@ interactive_autoprepare() if [ "$BOOT_PART_SIZE" = "" ]; then notify "ERROR: You have entered an invalid size, please enter again." else - if [ "$BOOT_PART_SIZE" -ge "$DISC_SIZE" -o "$BOOT_PART_SIZE" -lt "16" -o "$SBOOT_PART_SIZE" = "$DISC_SIZE" ]; then + if [ "$BOOT_PART_SIZE" -ge "$DISC_SIZE" -o "$SBOOT_PART_SIZE" = "$DISC_SIZE" ]; then notify "ERROR: You have entered a too large size, please enter again." + elif [ "$BOOT_PART_SIZE" -lt "16" ]; + then + notify "ERROR: You have entered a too small size, please enter again." else BOOT_PART_SET=1 fi |