[Midnightbsd-cvs] src: etc/rc.d: change the name of pidfile not to conflict

[laffer1 at midnightbsd.org]

Log Message:
-----------
change the name of pidfile not to conflict

Modified Files:
--------------
    src/etc/rc.d:
        netif (r1.4 -> r1.5)
        wpa_supplicant (r1.3 -> r1.4)

-------------- next part --------------
Index: wpa_supplicant
===================================================================
RCS file: /home/cvs/src/etc/rc.d/wpa_supplicant,v
retrieving revision 1.3
retrieving revision 1.4
diff -L etc/rc.d/wpa_supplicant -L etc/rc.d/wpa_supplicant -u -r1.3 -r1.4
--- etc/rc.d/wpa_supplicant
+++ etc/rc.d/wpa_supplicant
@@ -32,8 +32,8 @@
 
 load_rc_config $name
 
-pidfile="/var/run/${name}/${ifn}.pid"
-command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pidfile"
+pid_file="/var/run/${name}/${ifn}.pid"
+command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
 required_files=$conf_file
 
 run_rc_command "$1"
Index: netif
===================================================================
RCS file: /home/cvs/src/etc/rc.d/netif,v
retrieving revision 1.4
retrieving revision 1.5
diff -L etc/rc.d/netif -L etc/rc.d/netif -u -r1.4 -r1.5
--- etc/rc.d/netif
+++ etc/rc.d/netif
@@ -38,15 +38,15 @@
 cloneup_cmd="clone_up"
 clonedown_cmd="clone_down"
 extra_commands="cloneup clonedown"
-_cmdifn=
+cmdifn=
 
 network_start()
 {
 	# Set the list of interfaces to work on.
 	#
-	_cmdifn=$*
+	cmdifn=$*
 
-	if [ -z "$_cmdifn" ]; then
+	if [ -z "$cmdifn" ]; then
 		#
 		# We're operating as a general network start routine.
 		#
@@ -57,6 +57,9 @@
 		# Create cloned interfaces
 		clone_up
 
+		# Create Fast EtherChannel interfaces
+		fec_up
+
 		# Create IPv6<-->IPv4 tunnels
 		gif_up
 
@@ -71,13 +74,16 @@
 		# Resync ipfilter
 		/etc/rc.d/ipfilter resync
 	fi
+	if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then
+		/etc/rc.d/bridge start $cmdifn
+	fi
 }
 
 network_stop()
 {
 	# Set the list of interfaces to work on.
 	#
-	_cmdifn=$*
+	cmdifn=$*
 
 	echo -n "Stopping network:"
 
@@ -95,6 +101,8 @@
 #	configured interface(s).
 network_common()
 {
+	local _cooked_list _fail _func _verbose
+
 	_func=
 	_verbose=
 
@@ -108,15 +116,16 @@
 	# Set the scope of the command (all interfaces or just one).
 	#
 	_cooked_list=
-	if [ -n "$_cmdifn" ]; then
+	if [ -n "$cmdifn" ]; then
 		# Don't check that the interfaces exist.  We need to run
 		# the down code even when the interface doesn't exist to
 		# kill off wpa_supplicant.
-		_cooked_list="$_cmdifn"
+		_cooked_list="$cmdifn"
 	else
 		_cooked_list="`list_net_interfaces`"
 	fi
 
+	_fail=
 	for ifn in ${_cooked_list}; do
 		if ${_func} ${ifn} ; then
 			eval showstat_$ifn=1