d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of bugs saving network config.

Browse Source 
Don't duplicate wlans_ lines.
Enable ipv6 on wireless devices correctly.

Submitted by:	kris
Obtained from:	PC-BSD
This commit is contained in:
Josh Paetzel 2012-03-12 20:44:44 +00:00
parent 2bcfa25df8
commit de814251a2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/pc-sysinstall/backend/functions-networking.sh
View File

@ -104,7 +104,10 @@ enable_dhcp_all()
then then
# We have a wifi device, setup a wlan* entry for it # We have a wifi device, setup a wlan* entry for it
WLAN="wlan${WLANCOUNT}" WLAN="wlan${WLANCOUNT}"
echo "wlans_${NIC}=\"${WLAN}\"" >>${FSMNT}/etc/rc.conf cat ${FSMNT}/etc/rc.conf | grep -q "wlans_${NIC}="
if [ $? -ne 0 ] ; then
echo "wlans_${NIC}=\"${WLAN}\"" >>${FSMNT}/etc/rc.conf
fi
echo "ifconfig_${WLAN}=\"DHCP\"" >>${FSMNT}/etc/rc.conf echo "ifconfig_${WLAN}=\"DHCP\"" >>${FSMNT}/etc/rc.conf
CNIC="${WLAN}" CNIC="${WLAN}"
WLANCOUNT=$((WLANCOUNT+1)) WLANCOUNT=$((WLANCOUNT+1))
@ -138,7 +141,7 @@ enable_slaac_all()
do do
NIC="`echo $line | cut -d ':' -f 1`" NIC="`echo $line | cut -d ':' -f 1`"
DESC="`echo $line | cut -d ':' -f 2`" DESC="`echo $line | cut -d ':' -f 2`"
echo_log "Setting $NIC to acceptign RAs on the system." echo_log "Setting $NIC to accepting RAs on the system."
check_is_wifi ${NIC} check_is_wifi ${NIC}
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
@ -146,9 +149,12 @@ enable_slaac_all()
# Given we cannot have DHCP and SLAAC the same time currently # Given we cannot have DHCP and SLAAC the same time currently
# it's save to just duplicate. # it's save to just duplicate.
WLAN="wlan${WLANCOUNT}" WLAN="wlan${WLANCOUNT}"
echo "wlans_${NIC}=\"${WLAN}\"" >>${FSMNT}/etc/rc.conf cat ${FSMNT}/etc/rc.conf | grep -q "wlans_${NIC}="
if [ $? -ne 0 ] ; then
echo "wlans_${NIC}=\"${WLAN}\"" >>${FSMNT}/etc/rc.conf
fi
#echo "ifconfig_${NIC}=\"up\"" >>${FSMNT}/etc/rc.conf #echo "ifconfig_${NIC}=\"up\"" >>${FSMNT}/etc/rc.conf
echo "ifconfig_${WLAN}=\"inet6 accept_rtadv\"" >>${FSMNT}/etc/rc.conf echo "ifconfig_${WLAN}_ipv6=\"inet6 accept_rtadv\"" >>${FSMNT}/etc/rc.conf
CNIC="${WLAN}" CNIC="${WLAN}"
WLANCOUNT=$((WLANCOUNT+1)) WLANCOUNT=$((WLANCOUNT+1))
else else