From 01cabcd769cbca4726a050998e654983dc45f163 Mon Sep 17 00:00:00 2001 From: Gerhard Brauer Date: Wed, 8 Jul 2009 09:39:48 +0200 Subject: [PATCH] Fixed static IP setting om interactice http/ftp proxy values were set default to a value 0, so that 0 was exported as proxy settings. This leads that all pacman operations faled, cause we have false proxy-settings (0 is not a valid proxy) Signed-off-by: Gerhard Brauer --- src/core/libs/lib-ui-interactive.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 3774707..63e2a87 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -777,11 +777,11 @@ interactive_runtime_network() { GW=$ANSWER_STRING ask_string "Enter your DNS server IP" "192.168.0.1" || return 1 DNS=$ANSWER_STRING - ask_string "Enter your HTTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 0 || return 1 + ask_string "Enter your HTTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." "" 0 || return 1 PROXY_HTTP=$ANSWER_STRING - ask_string "Enter your FTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 0 || return 1 + ask_string "Enter your FTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." "" 0 || return 1 PROXY_FTP=$ANSWER_STRING - ask_yesno "Are these settings correct?\n\nIP address: $IPADDR\nNetmask: $SUBNET\nGateway (optional): $GW\nDNS server: $DNS\nHTTP proxy server: $PROXY_HTTP\nFTP proxy server: $PROXY_FTP" + ask_yesno "Are these settings correct?\n\nIP address: $IPADDR\nNetmask: $SUBNET\nBroadcast: $BROADCAST\nGateway (optional): $GW\nDNS server: $DNS\nHTTP proxy server: $PROXY_HTTP\nFTP proxy server: $PROXY_FTP" case $? in 1) ;; 0) NETPARAMETERS="1" ;; -- 1.6.3.3