summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-11-11 22:45:39 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-11-11 22:45:39 +0100
commit34d3b675c8d41d7c22ce08d5fa70c07c06d4e66a (patch)
treeb775f95276a067a74491697ca8d26028a8cd6fbc
parent59fe0a3e5b779e64004dfba249a74ff69a475d56 (diff)
typo fix for nextitem + todo updates
-rw-r--r--TODO1
-rw-r--r--src/core/procedures/interactive17
2 files changed, 10 insertions, 8 deletions
diff --git a/TODO b/TODO
index 22f64d7..8c0d128 100644
--- a/TODO
+++ b/TODO
@@ -46,6 +46,7 @@ PRODUCTION PHASE: be the primary installer. deprecate /arch/setup and /arch/qui
* core/interactive: more control over filesystems (lvm, dm_crypt, choose each FS and each size yourself)
when doing lvm install. copy /etc/lvm/backup to /etc on target (or maybe
it can be regenerated with a command, i should look that up)
+* core/interactive: when auto-setting up hard disk. show with a bit more detail what is happening (not 'partitioning <disk>' but partitioning, and each FS)
* core/interactive: do pacman -Sy in the background during early phases, to
lessen the wait period before selecting packages
* write bash completion thing for fifa modules/procedures
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 8dccddd..7f1bf2e 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -96,7 +96,7 @@ mainmenu()
"3")
check_depend worker prepare_disks && execute worker package_list && S_SELECT=1 && NEXTITEM=4 ;;
"4")
- check_depend worker package_list && execute worker install_packages && S_INSTALL=1 && { execute worker auto_fstab; execute worker auto_network; execute worker auto_locale; } && NEXITITEM=5 ;;
+ check_depend worker package_list && execute worker install_packages && S_INSTALL=1 && { execute worker auto_fstab; execute worker auto_network; execute worker auto_locale; } && NEXTITEM=5 ;;
"5")
check_depend worker install_packages && execute worker configure_system && S_CONFIG=1 && { execute worker mkinitcpio; execute worker locales; } && NEXTITEM=6 ;;
"6")
@@ -140,12 +140,13 @@ worker_prepare_disks()
ret=1 # 1 means unsuccessful. 0 for ok
NEXTITEM=
DISK_CONFIG_TYPE=
- while [ "$DONE" = "0" ]; do
- if [ -n "$NEXTITEM" ]; then
- DEFAULT="--default-item $NEXTITEM"
- else
- DEFAULT=""
- fi
+
+ while [ "$DONE" = "0" ]
+ do
+ DEFAULT=""
+ [ -n "$NEXTITEM" ] && DEFAULT="--default-item $NEXTITEM"
+
+
_dia_DIALOG $DEFAULT --menu "Prepare Hard Drive" 12 60 5 \
"1" "Auto-Prepare (erases the ENTIRE hard drive and sets up partitions and filesystems)" \
"2" "Partition Hard Drives" \
@@ -154,7 +155,7 @@ worker_prepare_disks()
NEXTITEM="$(cat $ANSWER)"
case $(cat $ANSWER) in
"1")
- interactive_autoprepare && NEXTITEM=4 && ret=0 && DISK_CONFIG_TYPE=auto;;
+ interactive_autoprepare && NEXTITEM=4 && ret=0 && DISK_CONFIG_TYPE=auto;; #TODO: for some reason. if this completes $?=0, next item will be 1 :/
"2")
if [ "$DISK_CONFIG_TYPE" = "auto" ]; then
notify "You have already prepared your filesystems with Auto-prepare" #TODO: allow user to do this anyway. he can change his mind.