diff options
author | jpaetzel <jpaetzel@FreeBSD.org> | 2011-01-08 22:42:56 +0000 |
---|---|---|
committer | jpaetzel <jpaetzel@FreeBSD.org> | 2011-01-08 22:42:56 +0000 |
commit | 26e5735cfb7105da5b9a155235e1fa3fde0ba7a7 (patch) | |
tree | 878a6be236871b69a385103417f061abbc38f360 /usr.sbin/pc-sysinstall/backend/functions-networking.sh | |
parent | 6fbd535b5a16e2601294be6e8c66395aeb60e468 (diff) | |
download | FreeBSD-src-26e5735cfb7105da5b9a155235e1fa3fde0ba7a7.zip FreeBSD-src-26e5735cfb7105da5b9a155235e1fa3fde0ba7a7.tar.gz |
Push some PC-BSD specific fixes upstream.
PR: bin/152894
Submitted by: Kris Moore <kmoore@FreeBSD.org>
Approved by: imp
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-networking.sh')
-rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-networking.sh | 57 |
1 files changed, 6 insertions, 51 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-networking.sh b/usr.sbin/pc-sysinstall/backend/functions-networking.sh index 22602a9..419bd3f 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-networking.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-networking.sh @@ -54,7 +54,7 @@ check_is_wifi() fi }; -# Function to get the first available wired nic, used for lagg0 setup +# Function to get the first available wired nic, used for setup get_first_wired_nic() { rm ${TMPDIR}/.niclist >/dev/null 2>/dev/null @@ -78,8 +78,9 @@ get_first_wired_nic() return }; -# Function which simply enables plain dhcp on all detected nics, not fancy lagg interface -enable_plain_dhcp_all() + +# Function which simply enables plain dhcp on all detected nics +enable_dhcp_all() { rm ${TMPDIR}/.niclist >/dev/null 2>/dev/null # start by getting a list of nics on this system @@ -111,57 +112,11 @@ enable_plain_dhcp_all() fi }; -# Function which enables fancy lagg dhcp on specified wifi -enable_lagg_dhcp() -{ - WIFINIC="$1" - - # Get the first wired nic - get_first_wired_nic - WIRENIC=$VAL - LAGGPORT="laggport ${WIFINIC}" - - echo "# Auto-Enabled NICs from pc-sysinstall" >>${FSMNT}/etc/rc.conf - if [ ! -z "$WIRENIC" ] - then - echo "ifconfig_${WIRENIC}=\"up\"" >> ${FSMNT}/etc/rc.conf - echo "ifconfig_${WIFINIC}=\"\`ifconfig ${WIRENIC} ether\`\"" >> ${FSMNT}/etc/rc.conf - echo "ifconfig_${WIFINIC}=\"ether \${ifconfig_${WIFINIC}##*ether }\"" >> ${FSMNT}/etc/rc.conf - LAGGPORT="laggport ${WIRENIC} ${LAGGPORT}" - fi - - echo "wlans_${WIFINIC}=\"wlan0\"" >> ${FSMNT}/etc/rc.conf - echo "cloned_interfaces=\"lagg0\"" >> ${FSMNT}/etc/rc.conf - echo "ifconfig_lagg0=\"laggproto failover ${LAGGPORT} DHCP\"" >> ${FSMNT}/etc/rc.conf - -}; -# Function which detects available nics, and runs them to DHCP on the +# Function which detects available nics, and enables dhcp on them save_auto_dhcp() { - rm ${TMPDIR}/.niclist >/dev/null 2>/dev/null - # start by getting a list of nics on this system - ${QUERYDIR}/detect-nics.sh > ${TMPDIR}/.niclist - if [ -e "${TMPDIR}/.niclist" ] - then - while read line - do - NIC="`echo $line | cut -d ':' -f 1`" - DESC="`echo $line | cut -d ':' -f 2`" - check_is_wifi "${NIC}" - if [ "$?" = "0" ] - then - # We have a wifi device, lets do fancy lagg interface - enable_lagg_dhcp "${NIC}" - return - fi - - done < ${TMPDIR}/.niclist - fi - - # Got here, looks like no wifi, so lets simply enable plain-ole-dhcp - enable_plain_dhcp_all - + enable_dhcp_all }; |