diff options
| author | Gerhard Brauer <gerbra@archlinux.de> | 2009-07-12 15:54:58 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-12 15:54:58 +0200 |
| commit | b668472a5f68a139e47516f70df94b2a327c16d0 (patch) | |
| tree | cb542c67b7ac65902d0a9bd29993a8e5b0f59e3d /src/core/libs | |
| parent | f6c2317a8f7324187abe1c51a775a5d530030f77 (diff) | |
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)
Diffstat (limited to 'src/core/libs')
| -rw-r--r-- | 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" ;; |