Revision: 13066
http://freenas.svn.sourceforge.net/freenas/?rev=13066&view=rev
Author: zippybr
Date: 2013-01-17 19:54:16 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
VLAN interface settings is already being set earlier
This will cause duplicated and incomplete rc.conf lines, e.g.:
ifconfig_vlan2="inet 192.168.0.2/24 mtu 9000"
...
ifconfig_vlan2="inet 192.168.0.2/24"
This needs to be further tested against regressions
Reported by: mav
Modified Paths:
--------------
trunk/nanobsd/Files/etc/rc.conf.local
Modified: trunk/nanobsd/Files/etc/rc.conf.local
===================================================================
--- trunk/nanobsd/Files/etc/rc.conf.local 2013-01-17 15:13:53 UTC (rev 13065)
+++ trunk/nanobsd/Files/etc/rc.conf.local 2013-01-17 19:54:16 UTC (rev 13066)
@@ -161,19 +161,8 @@
${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "SELECT vlan_vint from network_vlan WHERE vlan_pint = \"${vlan_pint}\"" | xargs echo -n
echo \"
done
- ${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "SELECT int_ipv4address, int_v4netmaskbit, int_dhcp, int_ipv6address, int_v6netmaskbit, int_ipv6auto, network_vlan.vlan_vint, network_vlan.vlan_tag FROM network_interfaces INNER JOIN network_vlan ON network_interfaces.int_interface=network_vlan.vlan_vint" | \
- while read ipv4addr ipv4netmask dodhcp ipv6addr ipv6netmask doipv6auto vlan_vint vlan_tag; do
- echo create_args_${vlan_vint}=\"vlan\ ${vlan_tag}\"
- echo -n ifconfig_${vlan_vint}=\"
- if [ "${dodhcp}" = "1" ]; then
- echo DHCP\"
- elif [ -n "${ipv4addr}" ]; then
- echo "inet ${ipv4addr}/${ipv4netmask}\""
- else
- echo \"
- fi
- done
- ${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "SELECT vlan_vint, vlan_tag from network_vlan WHERE vlan_vint NOT IN (SELECT int_interface from network_interfaces);" | \
+
+ ${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "SELECT vlan_vint, vlan_tag from network_vlan" | \
while read vlan_vint vlan_tag; do
echo create_args_${vlan_vint}=\"vlan\ ${vlan_tag}\"
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
