Remove baselayout-1 stuff

This commit is contained in:
Roy Marples 2007-07-31 18:23:56 +00:00
parent c22ccdf577
commit db7b953460
2 changed files with 45 additions and 49 deletions

View File

@ -647,61 +647,61 @@
# The PPP daemon has many options you can specify - although there are many # The PPP daemon has many options you can specify - although there are many
# and may seem daunting, it is recommended that you read the pppd man page # and may seem daunting, it is recommended that you read the pppd man page
# before enabling any of them # before enabling any of them
#pppd_ppp0=( #pppd_ppp0="
# "maxfail 0" # WARNING: It's not recommended you use this # 'maxfail 0' # WARNING: It's not recommended you use this
# # if you don't specify maxfail then we assume 0 # # if you don't specify maxfail then we assume 0
# "updetach" # If not set, "/etc/init.d/net.ppp0 start" will return # 'updetach' # If not set, "/etc/init.d/net.ppp0 start" will return
# # immediately, without waiting the link to come up # # immediately, without waiting the link to come up
# # for the first time. # # for the first time.
# # Do not use it for dial-on-demand links! # # Do not use it for dial-on-demand links!
# "debug" # Enables syslog debugging # 'debug' # Enables syslog debugging
# "noauth" # Do not require the peer to authenticate itself # 'noauth' # Do not require the peer to authenticate itself
# "defaultroute" # Make this PPP interface the default route # 'defaultroute' # Make this PPP interface the default route
# "usepeerdns" # Use the DNS settings provided by PPP # 'usepeerdns' # Use the DNS settings provided by PPP
# #
# On demand options # On demand options
# "demand" # Enable dial on demand # 'demand' # Enable dial on demand
# "idle 30" # Link goes down after 30 seconds of inactivity # 'idle 30' # Link goes down after 30 seconds of inactivity
# "10.112.112.112:10.112.112.113" # Phony IP addresses # '10.112.112.112:10.112.112.113' # Phony IP addresses
# "ipcp-accept-remote" # Accept the peers idea of remote address # 'ipcp-accept-remote' # Accept the peers idea of remote address
# "ipcp-accept-local" # Accept the peers idea of local address # 'ipcp-accept-local' # Accept the peers idea of local address
# "holdoff 3" # Wait 3 seconds after link dies before re-starting # 'holdoff 3' # Wait 3 seconds after link dies before re-starting
# #
# Dead peer detection # Dead peer detection
# "lcp-echo-interval 15" # Send a LCP echo every 15 seconds # 'lcp-echo-interval 15' # Send a LCP echo every 15 seconds
# "lcp-echo-failure 3" # Make peer dead after 3 consective # 'lcp-echo-failure 3' # Make peer dead after 3 consective
# # echo-requests # # echo-requests
# #
# Compression options - use these to completely disable compression # Compression options - use these to completely disable compression
# noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp # noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp
# #
# Dial-up settings # Dial-up settings
# "lock" # Lock serial port # 'lock' # Lock serial port
# "115200" # Set the serial port baud rate # '115200' # Set the serial port baud rate
# "modem crtscts" # Enable hardware flow control # 'modem crtscts' # Enable hardware flow control
# "192.168.0.1:192.168.0.2" # Local and remote IP addresses # '192.168.0.1:192.168.0.2' # Local and remote IP addresses
#) #"
# #
# Dial-up PPP users need to specify at least one telephone number # Dial-up PPP users need to specify at least one telephone number
#phone_number_ppp0=( "12345689" ) # Maximum 2 phone numbers are supported #phone_number_ppp0=( "12345689" ) # Maximum 2 phone numbers are supported
# They will also need a chat script - here's a good one # They will also need a chat script - here's a good one
#chat_ppp0=( #chat_ppp0=" \
# 'ABORT' 'BUSY' # 'ABORT' 'BUSY' \
# 'ABORT' 'ERROR' # 'ABORT' 'ERROR' \
# 'ABORT' 'NO ANSWER' # 'ABORT' 'NO ANSWER' \
# 'ABORT' 'NO CARRIER' # 'ABORT' 'NO CARRIER' \
# 'ABORT' 'NO DIALTONE' # 'ABORT' 'NO DIALTONE' \
# 'ABORT' 'Invalid Login' # 'ABORT' 'Invalid Login' \
# 'ABORT' 'Login incorrect' # 'ABORT' 'Login incorrect' \
# 'TIMEOUT' '5' # 'TIMEOUT' '5' \
# '' 'ATZ' # '' 'ATZ' \
# 'OK' 'AT' # Put your modem initialization string here # 'OK' 'AT' # Put your modem initialization string here \
# 'OK' 'ATDT\T' # 'OK' 'ATDT\T' \
# 'TIMEOUT' '60' # 'TIMEOUT' '60' \
# 'CONNECT' '' # 'CONNECT' '' \
# 'TIMEOUT' '5' # 'TIMEOUT' '5' \
# '~--' '' # '~--' '' \
#) #"
# If the link require extra configuration - for example wireless or # If the link require extra configuration - for example wireless or
# RFC 268 bridge - we need to depend on the bridge so they get # RFC 268 bridge - we need to depend on the bridge so they get
@ -1020,7 +1020,7 @@
# # Enable Wake-On-LAN for every interface except for lo # # Enable Wake-On-LAN for every interface except for lo
# # Probably a good idea to set RC_DOWN_INTERFACE="no" in /etc/conf.d/rc # # Probably a good idea to set RC_DOWN_INTERFACE="no" in /etc/conf.d/rc
# # as well ;) # # as well ;)
# [[ ${IFACE} != "lo" ]] && ethtool -s "${IFACE}" wol g # [ "${IFACE}" != "lo" ] && ethtool -s "${IFACE}" wol g
# Automatically erase any ip rules created in the example postup above # Automatically erase any ip rules created in the example postup above
# if interface_exists "${IFACE}" ; then # if interface_exists "${IFACE}" ; then

View File

@ -439,9 +439,7 @@ iwconfig_scan() {
i=$((${i} + 1)) i=$((${i} + 1))
done done
local i=0 e= m= black= s= local i=0 e= m= s=
eval "$(_get_array "blacklist_aps")"
black="$@"
while [ ${i} -le ${APS} ] ; do while [ ${i} -le ${APS} ] ; do
eval x=\$MAC_${i} eval x=\$MAC_${i}
@ -582,7 +580,7 @@ iwconfig_defaults() {
} }
iwconfig_configure() { iwconfig_configure() {
local x APS local x= APS=
eval SSID=\$ssid_${IFVAR} eval SSID=\$ssid_${IFVAR}
# Support old variable # Support old variable
@ -615,18 +613,16 @@ iwconfig_configure() {
return 1 return 1
fi fi
# Do we have a preferred Access Point list specific to the interface? eval x=\$preferred_aps_${IFVAR}
# x="preferred_aps_${ifvar}[@]" [ -n "${x}" ] && preferred_aps=${x}
# [[ -n ${!x} ]] && preferred_aps=( "${!x}" )
# # Do we have a blacklist Access Point list specific to the interface? eval x=\$blacklist_aps_${IFVAR}
# x="blacklist_aps_${ifvar}[@]" [ -n "${x}" ] && blacklist_aps=${x}
# [[ -n ${!x} ]] && blacklist_aps=( "${!x}" )
# Are we forcing preferred only?
eval x=\$associate_order_${IFVAR} eval x=\$associate_order_${IFVAR}
[ -n "${x}" ] && associate_order=${x} [ -n "${x}" ] && associate_order=${x}
associate_order=${associate_order:-any} associate_order=${associate_order:-any}
if [ "${associate_order}" = "forcepreferredonly" ]; then if [ "${associate_order}" = "forcepreferredonly" ]; then
iwconfig_force_preferred && return 0 iwconfig_force_preferred && return 0
else else