root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

more netcfg fixes

Browse source
This commit is contained in:
Tobias Powalowski 2012-07-26 12:45:33 +02:00
parent 8e960518bd
commit f90531b4c0
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
usr/share/archboot/installer/setup
View file

@ -3121,11 +3121,11 @@ donetwork() {
S_DHCP=1
else
IP="static"
DIALOG --inputbox "Enter your IP address" 5 40 "192.168.1.23" 2>${ANSWER} || return 1
DIALOG --inputbox "Enter your IP address" 7 40 "192.168.1.23" 2>${ANSWER} || return 1
IPADDR=$(cat ${ANSWER})
DIALOG --inputbox "Enter your gateway" 5 40 "192.168.1.1" 2>${ANSWER} || return 1
DIALOG --inputbox "Enter your gateway" 7 40 "192.168.1.1" 2>${ANSWER} || return 1
GW=$(cat ${ANSWER})
DIALOG --inputbox "Enter your DNS server IP" 5 40 "192.168.1.1" 2>${ANSWER} || return 1
DIALOG --inputbox "Enter your DNS server IP" 7 40 "192.168.1.1" 2>${ANSWER} || return 1
DNS=$(cat ${ANSWER})
fi
DIALOG --yesno "Are these settings correct?\n\nInterface: ${INTERFACE}\nConnection: ${CONNECTION}\nESSID in hexadecimal: ${WLAN_HEX}\nESSID: ${WLAN_ESSID}\nHidden: ${WLAN_HIDDEN}\nEncryption: ${WLAN_SECURITY}\nKey: ${WLAN_KEY}\ndhcp or static: ${IP}\nUse dhclient: ${DHCLIENT}\nIP address: ${IPADDR}\nGateway: ${GW}\nDNS server: ${DNS}" 0 0
@ -3136,33 +3136,37 @@ donetwork() {
done
# profile name
NETWORK_PROFILE=""
DIALOG --inputbox "Enter your network profile name" 16 65 "${INTERFACE}-${CONNECTION}" 2>${ANSWER} || return 1
NETWORK_PROFILE=$(cat ${ANSWER})
DIALOG --inputbox "Enter your network profile name" 7 40 "${INTERFACE}-${CONNECTION}" 2>${ANSWER} || return 1
NETWORK_PROFILE=/etc/network.d/$(cat ${ANSWER})
# write profile
echo "CONNECTION=\'${CONNECTION}\'" >/etc/network.d/${NETWORK_PROFILE}
echo "DESCRIPTION=\'$NETWORK_PROFILE generated by archboot setup\'" >>/etc/network.d/${NETWORK_PROFILE}
echo "INTERFACE=\'${INTERFACE}\'" >>/etc/network.d/${NETWORK_PROFILE}
echo "CONNECTION='${CONNECTION}'" >${NETWORK_PROFILE}
echo "DESCRIPTION='$NETWORK_PROFILE generated by archboot setup'" >>${NETWORK_PROFILE}
echo "INTERFACE='${INTERFACE}'" >>${NETWORK_PROFILE}
if [[ "${CONNECTION}" = "wireless" ]]; then
echo "SECURITY=\'${WLAN_SECURITY}\'" >>/etc/network.d/${NETWORK_PROFILE}
[[ "${WLAN_HEX}" = "yes" ]] && echo "ESSID_TYPE='hex'" >>/etc/network.d/${NETWORK_PROFILE}
echo "ESSID=\'${WLAN_ESSID}\'" >>/etc/network.d/${NETWORK_PROFILE}
echo "KEY=\'${WLAN_KEY}\'" >>/etc/network.d/${NETWORK_PROFILE}
[[ "${WLAN_HIDDEN}" = "yes" ]] && echo "HIDDEN=yes" >>/etc/network.d/${NETWORK_PROFILE}
echo "SECURITY='${WLAN_SECURITY}'" >>${NETWORK_PROFILE}
[[ "${WLAN_HEX}" = "yes" ]] && echo "ESSID_TYPE='hex'" >>${NETWORK_PROFILE}
echo "ESSID='${WLAN_ESSID}'" >>${NETWORK_PROFILE}
echo "KEY='${WLAN_KEY}'" >>${NETWORK_PROFILE}
[[ "${WLAN_HIDDEN}" = "yes" ]] && echo "HIDDEN=yes" >>${NETWORK_PROFILE}
fi
echo "IP=\'${IP}\'" >>/etc/network.d/${NETWORK_PROFILE}
echo "IP='${IP}'" >>${NETWORK_PROFILE}
if [[ "${IP}" = "dhcp" ]]; then
[[ "${DHCLIENT}" = "yes" ]] && echo "DHCLIENT=yes" >>/etc/network.d/${NETWORK_PROFILE}
[[ "${DHCLIENT}" = "yes" ]] && echo "DHCLIENT=yes" >>${NETWORK_PROFILE}
else
echo "ADDR=\'${IPADDR}\'" >>/etc/network.d/${NETWORK_PROFILE}
echo "GATEWAY=\'${GW}\'" >>/etc/network.d/${NETWORK_PROFILE}
echo "DNS=\(\'${DNS}\'\)" >>/etc/network.d/${NETWORK_PROFILE}
echo "ADDR='${IPADDR}'" >>${NETWORK_PROFILE}
echo "GATEWAY='${GW}'" >>${NETWORK_PROFILE}
echo "DNS=('${DNS}')" >>${NETWORK_PROFILE}
fi
# run netcfg
netcfg -u $(basename ${NETWORK_PROFILE}) >${LOG}
if [[ $? -gt 0 ]]; then
DIALOG --msgbox "Error occured while running netcfg. (see ${LOG} for output)" 0 0
return 1
fi
# run netcfg
netcfg -u ${NETWORK_PROFILE}
# http/ftp proxy settings
DIALOG --inputbox "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." 16 65 "" 2>${ANSWER} || return 1
DIALOG --inputbox "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." 13 65 "" 2>${ANSWER} || return 1
PROXY_HTTP=$(cat ${ANSWER})
DIALOG --inputbox "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." 16 65 "" 2>${ANSWER} || return 1
DIALOG --inputbox "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." 13 65 "" 2>${ANSWER} || return 1
PROXY_FTP=$(cat ${ANSWER})
if [[ "${PROXY_HTTP}" = "" ]]; then
unset http_proxy