diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-07 21:23:38 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-07 21:23:38 +0100 |
| commit | c416b909783915cf148123e8bcee217184dccb4a (patch) | |
| tree | e76ae0be6e20133cea18cea9703b22e6c75116ad /src/core/procedures | |
| parent | bf86da5e959d0c0d1895ad1bbb527c676f43a042 (diff) | |
| parent | 3a01621b8382964d348c35084840c8404f8257a9 (diff) | |
merging blockdevicerefactor into master
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/base | 13 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 16 |
2 files changed, 4 insertions, 25 deletions
diff --git a/src/core/procedures/base b/src/core/procedures/base index e18298d..24131dd 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -72,18 +72,7 @@ worker_runtime_packages () worker_set_clock () { - HARDWARECLOCK=utc - TIMEZONE=`tzselect` - HWCLOCK_PARAMS=" --utc" - if [ "$TIMEZONE" != "" -a -e "/usr/share/zoneinfo/$TIMEZONE" ] - then - cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime - fi - - ask_string "Enter date [MMDDhhmmYYYY.ss]" # Thanks Ryan Sims for this one - date $answ || show_warning "Date/time setting failed" "Something went wrong when doing date $answ" - - /sbin/hwclock --hctosys $HWCLOCK_PARAMS --noadjfile + interactive_set_clock } diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 1b23a45..9739cd3 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -1,5 +1,5 @@ #!/bin/sh -depend_procedure core base # esp for auto_{network,locale,fstab} and intro workers +depend_procedure core base # esp for auto_{network,locale,fstab}, intro and set_clock workers # This is a port of the original /arch/setup script. It doesn't use aif phases but uses it's own menu-based flow (phase) control @@ -142,7 +142,7 @@ worker_prepare_disks() ask_option $default "Prepare Hard Drive" \ "1" "Auto-Prepare (erases the ENTIRE hard drive and sets up partitions and filesystems)" \ "2" "Partition Hard Drives" \ - "3" "Set Filesystem Mountpoints" \ + "3" "Configure block devices, filesystems and mountpoints" \ "4" "Return to Main Menu" case $ANSWER_OPTION in @@ -160,7 +160,7 @@ worker_prepare_disks() 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. else - interactive_mountpoints && ret=0 && NEXTITEM=4 && DISK_CONFIG_TYPE=manual + interactive_filesystems && ret=0 && NEXTITEM=4 && DISK_CONFIG_TYPE=manual fi ;; *) @@ -171,16 +171,6 @@ worker_prepare_disks() } -# set_clock() -# prompts user to set hardware clock and timezone -# -# params: none -worker_set_clock() -{ - interactive_set_clock -} - - worker_select_source () { #TODO: how to handle user going here again? discard previous settings, warn him that he already done it? |