summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-11-12 19:49:57 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-11-12 19:49:57 +0100
commitd4a954b00350b387d27a9002631700a8a30fa8be (patch)
treee35e40436689c761edc2445b7e5979fafdddde20 /src/core
parentcc8da1929e18b64fb5fa72c82090a09fee37ea0f (diff)
exit code fix worker_auto_network + various cleanups
Diffstat (limited to 'src/core')
-rw-r--r--src/core/procedures/interactive27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 40847e7..6f88129 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -51,7 +51,6 @@ start_process ()
do
mainmenu
done
-
}
@@ -113,20 +112,20 @@ select_source_extras_menu ()
worker_configure_system()
{
- ## PREPROCESSING ##
+ ## PREPROCESSING ##
#TODO: only need to do this once. check 'ended_ok worker configure_system' is not good because this could be done already even if worker did not exit 0
- # /etc/pacman.d/mirrorlist
- # add installer-selected mirror to the top of the mirrorlist
- if [ "$var_PKG_SOURCE_TYPE" = "ftp" -a "${SYNC_URL}" != "" ]; then
- awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "${var_TARGET_DIR}/etc/pacman.d/mirrorlist"
- fi
+ # /etc/pacman.d/mirrorlist
+ # add installer-selected mirror to the top of the mirrorlist
+ if [ "$var_PKG_SOURCE_TYPE" = "ftp" -a "${SYNC_URL}" != "" ]; then
+ awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "${var_TARGET_DIR}/etc/pacman.d/mirrorlist"
+ fi
- # /etc/rc.conf
- # Make sure timezone and utc info are what we want
- sed -i -e "s/^TIMEZONE=.*/TIMEZONE=\"$TIMEZONE\"/g" \
- -e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$HARDWARECLOCK\"/g" \
- ${var_TARGET_DIR}/etc/rc.conf
+ # /etc/rc.conf
+ # Make sure timezone and utc info are what we want
+ sed -i -e "s/^TIMEZONE=.*/TIMEZONE=\"$TIMEZONE\"/g" \
+ -e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$HARDWARECLOCK\"/g" \
+ ${var_TARGET_DIR}/etc/rc.conf
interactive_configure_system && return 0
@@ -239,8 +238,8 @@ worker_install_bootloader ()
worker_auto_network ()
{
- ask_yesno "Do you want to use the network settings from the installer in rc.conf and resolv.conf?\n\nIf you used Proxy settings, they will be written to /etc/profile.d/proxy.sh" || return 1
+ ask_yesno "Do you want to use the network settings from the installer in rc.conf and resolv.conf?\n\nIf you used Proxy settings, they will be written to /etc/profile.d/proxy.sh" || return 0
- [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP"
+ [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP"
[ "$S_DHCP" != 1 ] && target_configure_network fixed "$PROXY_HTTP" "$PROXY_FTP"
}