* Allow multiple commands in $ifconfig_xxN variables in rc.conf(5). This may be done either by embedding newlines in the value, or by using semicolons to represent line breaks (but not both at once). * Allow shell quoting insode $ifconfig_xxN variables or /etc/ifconfig.xxN files. This allows something like ifconfig_wi0="ssid 'my network'; dhcp"

(apb)

 @@ -1,14 +1,14 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1122 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1123 $>
+#
+#
 # [Note: This file does not mention every change made to the NetBSD source tree.
 # For an exhaustive list, please subscribe to the `source-changes' mailing list,
 # or see the mailing list archives.  For more information, send a message
 # containing just the word `help' to `majordomo@NetBSD.org'.]
+#
 # ----------------------------------------------------------------------------
 # PLEASE USE THE FOLLOWING STYLE WHEN ADDING ITEMS:
+#
 #	theme: Content ...
 #		more content ...
 #		more content. [developer DATE-FORMAT]
 @@ -865,13 +865,17 @@ Changes from NetBSD 4.0 to NetBSD 5.0:
 		instead.  [apb 20080914]
 	postinstall(8): Deprecate the "-s tgz1:tgz2" option; please use
 		"-s tgz1 -s tgz2" instead.  [apb 20080914]
 	ataraid(4): Add support for status reports via bio(4) contributed
 		by Juan RP. [tron 20080915]
 	gem(4): Add support for Sun SBus SX fibre cards.  [jdc 20080915]
 	ataraid(4): Add support for multiple volumes attached to
 		Intel MatrixRAID controllers contributed by Juan RP.
 		[tron 20080916]
 	patch(1): Merge improved version from DragonFly.
 		patch -b behaves as specified by POSIX. [joerg 20080919]
 	am-utils: Upgrade to 6.2a3 to add new fs flags (log,symperm,...)
 		and efs and tmpfs.
 	rc.conf(5): ifconfig_xxN variables may now have multi-line
 		values, just like /etc/ifconfig.xxN files, and
 		semicolons may be used instead of line breaks.
 		[apb 20080920]

 @@ -1,28 +1,31 @@
 #!/bin/sh
+#
-# $NetBSD: network,v 1.53 2008/07/24 19:48:19 reed Exp $
+# $NetBSD: network,v 1.54 2008/09/20 12:12:38 apb Exp $
+#
 # PROVIDE: network
 # REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
 # BEFORE:  NETWORKING
 $_rc_subr_loaded . /etc/rc.subr
 name="network"
 start_cmd="network_start"
 stop_cmd="network_stop"
 nl='
 ' # a newline
 network_start()
+{
 	# set hostname, turn on network
+	#
 	echo "Starting network."
 	# If $hostname is set, use it for my Internet name,
 	# otherwise use /etc/myname
+	#
 	if [ -z "$hostname" ] && [ -f /etc/myname ]; then
 		hostname=$(cat /etc/myname)
 	fi
 	if [ -n "$hostname" ]; then
 @@ -145,32 +148,38 @@ network_start()
 		host)
 			echo 'IPv6 mode: host'
 			;;
 		*)	warn "invalid \$ip6mode value "\"$ip6mode\"
 			;;
 		esac
 	fi
 	# Configure all of the network interfaces listed in $net_interfaces;
 	# if $auto_ifconfig is YES, grab all interfaces from ifconfig.
 	# In the following, "xxN" stands in for interface names, like "le0".
 	# For any interfaces that has an $ifconfig_xxN variable associated,
-	# we do "ifconfig xxN $ifconfig_xxN".
+	# For any interfaces that has an $ifconfig_xxN variable
-	# If there is no such variable, we take the contents of the file
+	# associated, we break it into lines using ';' as a separator,
-	# /etc/ifconfig.xxN, and run "ifconfig xxN" repeatedly, using each
+	# then process it just like the contents of an /etc/ifconfig.xxN
-	# line of the file as the arguments for a separate "ifconfig"
+	# file.
 	# invocation.
 	# For each line from the $ifconfig_xxN variable or the
 	# /etc/ifconfig.xxN file, we ignore comments and blank lines,
 	# treat lines beginning with "!" as commands to execute, treat
 	# "dhcp" as a special case to invoke dhcpcd, and for any other
 	# line we run "ifconfig xxN", using each line of the file as the
 	# arguments for a separate "ifconfig" invocation.
+	#
 	# In order to configure an interface reasonably, you at the very least
 	# need to specify "[addr_family] [hostname]" (e.g "inet my.domain.org"),
 	# and probably a netmask (as in "netmask 0xffffffe0"). You will
 	# frequently need to specify a media type, as in "media UTP", for
 	# interface cards with multiple media connections that do not
 	# autoconfigure. See the ifconfig manual page for details.
+	#
 	# Note that /etc/ifconfig.xxN takes multiple lines.  The following
 	# configuration is possible:
 	#	inet 10.1.1.1 netmask 0xffffff00
 	#	inet 10.1.1.2 netmask 0xffffff00 alias
 	#	inet6 2001:db8::1 prefixlen 64 alias
 @@ -182,68 +191,107 @@ network_start()
 		if checkyesno auto_ifconfig; then
 			tmp=$(/sbin/ifconfig -l)
 			for cloner in $(/sbin/ifconfig -C 2>/dev/null); do
 				for int in /etc/ifconfig.${cloner}[0-9]*; do
 					[ ! -f $int ] && break
 					tmp="$tmp ${int##*.}"
 				done
 			done
 		else
 			tmp="$net_interfaces"
 		fi
 		echo -n 'Configuring network interfaces:'
 		for int in $tmp; do
-			eval args=\$ifconfig_$int
+			eval argslist=\$ifconfig_$int
 			if [ -n "$args" ] || [ -f /etc/ifconfig.$int ]; then
-				if /sbin/ifconfig $int create 2>/dev/null && \
+			# Skip interfaces that do not have explicit
-				   checkyesno ipfilter; then
+			# configuration information.  If auto_ifconfig is
-					# resync ipf(4)
+			# false then also warn about such interfaces.
 					/sbin/ipf -y >/dev/null
-				fi
+			if [ -z "$argslist" ] && ! [ -f /etc/ifconfig.$int ]
-			fi
+			then
 			if [ "$args" = "dhcp" ]; then
 				echo -n " $int"
 				/sbin/dhcpcd -n ${dhcpcd_flags} $int
 			elif [ -n "$args" ]; then
 				echo -n " $int"
 				/sbin/ifconfig $int $args
 			elif [ -f /etc/ifconfig.$int ]; then
 				echo -n " $int"
 				while read args; do
 					[ -z "$args" ] && continue
 					case "$args" in
 					"#"*|create)
 						;;
 					"!"*)
 						eval ${args#*!}
 						;;
 					dhcp)
 						/sbin/dhcpcd -n ${dhcpcd_flags} \
 						    $int
 						;;
 					*)
 						eval /sbin/ifconfig $int $args
 						;;
 					esac
 				done < /etc/ifconfig.$int
 			else
 				if ! checkyesno auto_ifconfig; then
 					echo
 					warn \
 			"/etc/ifconfig.$int missing and ifconfig_$int not set;"
 					warn "interface $int not configured."
 				fi
 				continue
 			fi
 			echo -n " $int"
 			# Create the interface if necessary.
 			# If the interface did not exist before,
 			# then also resync ipf(4).
+			#
 			if /sbin/ifconfig $int create 2>/dev/null && \
 			   checkyesno ipfilter; then
 				/sbin/ipf -y >/dev/null
 			fi
 			# If $ifconfig_xxN is empty, then use
 			# /etc/ifconfig.xxN, which we know exists due to
 			# an earlier test.
+			#
 			# If $ifconfig_xxN is non-empty and contains a
 			# newline, then just use it as is.  (This allows
 			# semicolons through unmolested.)
+			#
 			# If $ifconfig_xxN is non-empty and does not
 			# contain a newline, then convert all semicolons
 			# to newlines.
+			#
 			case "$argslist" in
 			'')
 				cat /etc/ifconfig.$int
 				;;
 			*"${nl}"*)
 				echo "$argslist"
 				;;
 			*)
+				(
 					set -o noglob
 					IFS=';'; set -- $argslist
 					#echo >&2 "[$#] [$1] [$2] [$3] [$4]"
 					IFS="$nl"; echo "$*"
+				)
 				;;
 			esac |
 			while read -r args; do
 				case "$args" in
 				''|"#"*|create)
 					;;
 				"!"*)
 					# Run arbitrary command in a subshell.
 					( eval "${args#*!}" )
 					;;
 				dhcp)
 					/sbin/dhcpcd -n ${dhcpcd_flags} $int
 					;;
 				*)
 					# Pass args to ifconfig.  Note
 					# that args may contain embedded
 					# shell metacharacters, such as
 					# "ssid 'foo;*>bar'".
+					(
 						set -o noglob
 						eval set -- "$args"
 						#echo >&2 "[$#] [$1] [$2] [$3]"
 						/sbin/ifconfig $int "$@"
+					)
 					;;
 				esac
 			done
 			configured_interfaces="$configured_interfaces $int"
 		done
 		echo "."
 	fi
 	# Check $defaultroute, then /etc/mygate, for the name or address
 	# of my IPv4 gateway host. If using a name, that name must be in
 	# /etc/hosts.
+	#
 	if [ -z "$defaultroute" ] && [ -f /etc/mygate ]; then
 		defaultroute=$(cat /etc/mygate)
 	fi
 	if [ -n "$defaultroute" ]; then
 @@ -264,56 +312,56 @@ network_start()
 			warn \
 	    "ip6mode is set to 'autohost' and a v6 default route is also set."
 		fi
 		/sbin/route add -inet6 default $defaultroute6
 	fi
 	echo -n "Adding interface aliases:"
 	# Check if each configured interface xxN has an $ifaliases_xxN variable
 	# associated, then configure additional IP addresses for that interface.
 	# The variable contains a list of "address netmask" pairs, with
 	# "netmask" set to "-" if the interface default netmask is to be used.
+	#
-	# Note that $ifaliases_xxN works only with certain configurations and
+	# Note that $ifaliases_xxN works only in certain cases and its
-	# considered not recommended.  Use /etc/ifconfig.xxN if possible.
+	# use is not recommended.  Use /etc/ifconfig.xxN or multiple
 	# commands in $ifconfig_xxN instead.
+	#
 	for int in lo0 $configured_interfaces; do
 		eval args=\$ifaliases_$int
 		if [ -n "$args" ]; then
 			set -- $args
 			while [ $# -ge 2 ]; do
 				addr=$1 ; net=$2 ; shift 2
 				if [ "$net" = "-" ]; then
 					# for compatibility only, obsolete
 					/sbin/ifconfig $int inet alias $addr
 				else
 					/sbin/ifconfig $int inet alias $addr \
 					    netmask $net
 				fi
 				echo -n " $int:$addr"
 			done
 		fi
 	done
 	# /etc/ifaliases, if it exists, contains the names of additional IP
 	# addresses for each interface. It is formatted as a series of lines
 	# that contain
 	#	address interface netmask
+	#
-	# Note that /etc/ifaliases works only with certain cases only and its
+	# Note that /etc/ifaliases works only in certain cases and its
-	# use is not recommended.  Use /etc/ifconfig.xxN instead.
+	# use is not recommended.  Use /etc/ifconfig.xxN or multiple
 	# commands in $ifconfig_xxN instead.
+	#
 	if [ -f /etc/ifaliases ]; then
 		while read addr int net; do
 			if [ -z "$net" ]; then
 				# for compatibility only, obsolete
 				/sbin/ifconfig $int inet alias $addr
 			else
 				/sbin/ifconfig $int inet alias $addr netmask $net
 			fi
 		done < /etc/ifaliases
 	fi
 	echo

 @@ -1,79 +1,102 @@
-.\"	$NetBSD: ifconfig.if.5,v 1.10 2008/05/29 15:38:35 joerg Exp $
+.\"	$NetBSD: ifconfig.if.5,v 1.11 2008/09/20 12:12:38 apb Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 27, 2008
+.Dd September 20, 2008
 .Dt IFCONFIG.IF 5
 .Os
 .Sh NAME
 .Nm ifconfig.if
-.Nd interface-specific configuration files
+.Nd interface-specific configuration files or variables
 .Sh DESCRIPTION
 The
 .Nm
-files contain information regarding the configuration of each network interface.
+files or variables contain information regarding the configuration
 of each network interface.
 .Nm
 is processed by
 .Pa /etc/rc.d/network
 at system boot time.
 .Pp
-One file should exist for each interface that is to be configured, such as
+For each interface
-.Pa /etc/ifconfig.fxp0 .
+.Pq Ar nnX
-The file will get evaluated only if the interface exists on the system.
+that is to be configured, there should be either an
-Multiple lines can be placed in a file, and will be evaluated sequentially.
+.Sy ifconfig_nnX
 variable in
 .Xr rc.conf 5 ,
 or an
 .Pa /etc/ifconfig.nnX
 file
 (such as the
 .Sy ifconfig_fxp0
 variable or the
 .Pa /etc/ifconfig.fxp0
 file for the
 .Sy fxp0
 interface).
 The variable or file will get evaluated only if the interface exists on
 the system.
 Multiple lines can be placed in a variable or file, and will be
 evaluated sequentially.
 In the case of a variable, semicolons may be used instead of
 newlines, as described in
 .Xr rc.conf 5 .
 .Pp
 Normally, a line will be evaluated as command line arguments to
 .Xr ifconfig 8 .
-.Dq Li ifconfig if
+.Dq Li ifconfig Ar nnX
 will be prepended on evaluation.
 Arguments with embedded shell metacharacters should be quoted in
 .Xr sh 1
 style.
 .Pp
 If the line is equal to
 .Dq dhcp ,
 .Xr dhcpcd 8
 will be started for the interface.
 .Pp
 If a line is empty, or starts with
 .Sq # ,
 the line will be ignored as comment.
 .Pp
 If a line starts with
 .Sq \&! ,
 the rest of line will get evaluated as shell script fragment.
 Shell variables declared in
 .Pa /etc/rc.d/network
-are accessible.
+are accessible but may not be modified.
 The most useful variable is
 .Li $int ,
 as it will be bound to the interface being configured with the file.
 .Pp
 For example, the following illustrates static interface configuration:
 .Bd -literal -offset indent
 # IPv4, with an alias
 inet 10.0.1.12 netmask 255.255.255.0 media 100baseTX
 inet 10.0.1.13 netmask 255.255.255.255 alias
 # let us have IPv6 address on this interface
 inet6 2001:db8::1 prefixlen 64 alias
 # have subnet router anycast address too
 inet6 2001:db8:: prefixlen 64 alias anycast
 @@ -90,24 +113,33 @@ up
 # autoconfigure IPv6 address.  Be sure to set $ip6mode to autohost.
 !rtsol $int
 .Ed
 .Pp
 The following example is for dynamically-created pseudo interfaces like
 .Xr gif 4 :
 .Bd -literal -offset indent
 up
 # configure IPv6 default route toward the interface
 !route add -inet6 default ::1
 !route change -inet6 default -ifp $int
 .Ed
 .Pp
 The following example sets a network name for a wireless interface
 (using quotes to protect special characters in the name),
 and starts
 .Xr dhcpcd 8 ) :
 .Bd -literal -offset indent
 ssid 'my network'
 dhcp
 .Ed
 .Pp
 Earlier versions of
 .Pa /etc/rc.d/network
 required an explicit
 .Sq create
 command for such interfaces.
 This is now handled automatically.
 .Sh FILES
 .Pa /etc/rc.d/network
 .Sh SEE ALSO
 .Xr rc.conf 5 ,
 .Xr ifconfig 8

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: rc.conf.5,v 1.119 2008/06/18 09:06:26 yamt Exp $
+.\"	$NetBSD: rc.conf.5,v 1.120 2008/09/20 12:12:38 apb Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 @@ -45,27 +45,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 13, 2008
+.Dd September 20, 2008
 .Dt RC.CONF 5
 .Os
 .Sh NAME
 .Nm rc.conf
 .Nd system startup configuration file
 .Sh DESCRIPTION
 The
 .Nm
 file specifies which services are enabled during system startup by
 the startup scripts invoked by
 .Pa /etc/rc
 (see
 .Xr rc 8 ) ,
 @@ -505,27 +505,29 @@ If you wish to configure all broadcast
 network interfaces using the DHCP client, you can leave this blank.
 To configure only specific interfaces, name the interfaces to be configured
 on the command line.
 .Pp
 If you must run the DHCP client before mounting critical file systems,
 then you should specify an alternate location for the DHCP client's lease
 file in the
 .Sy dhclient_flags
 variable - for example, "-lf /tmp/dhclient.leases".
 .It Sy dhcpcd_flags
 Additional arguments to pass to
 .Xr dhcpcd 8
 when requesting configuration via
-.Sy ifconfig_xxN .
+.Sy ifconfig_xxN
 or
 .Pa /etc/ifconfig.xxN .
 .It Sy flushroutes
 .Sq YES
 or
 .Sq NO .
 Flushes the route table on networking startup.
 Useful when coming up to multiuser mode after going down to
 single-user mode.
 .It Sy hostapd
 .Sq YES
 or
 .Sq NO .
 Runs
 .Xr hostapd 8 ,
 @@ -538,28 +540,30 @@ pairs to configure additional network ad
 configured interface
 .Dq *
 (e.g.
 .Sy ifaliases_le0 ) .
 If
 .Em netmask
 is
 .Dq - ,
 then use the default netmask for the interface.
 .Pp
 .Sy ifaliases_*
 covers limited cases only and considered unrecommended.
 We recommend using
 .Sy ifconfig_nnX
 variables or
 .Pa /etc/ifconfig.xxN
-with multiple lines instead.
+files with multiple lines instead.
 .It Sy ifwatchd
 .Sq YES
 or
 .Sq NO .
 Monitor dynamic interfaces and perform actions upon address changes.
 Passes
 .Sy ifwatchd_flags .
 .It Sy ip6mode
 A string.
 An IPv6 node can be a router
 .Pq nodes that forward packet for others
 or a host
 .Pq nodes that do not forward .
 @@ -668,44 +672,57 @@ See
 .It Sy ipsec
 .Sq YES
 or
 .Sq NO .
 Runs
 .Xr setkey 8
 to load in IPsec manual keys and policies from
 .Pa /etc/ipsec.conf
 at network boot time, before any interfaces are configured.
 .It Sy net_interfaces
 A string.
 The list of network interfaces to be configured at boot time.
 For each interface "xxN", the system first looks for ifconfig
-parameters in
+parameters in the variable
-.Pa /etc/ifconfig.xxN
+.Sy ifconfig_xxN ,
-and then in the variable
+and then in the file
-.Sy ifconfig_xxN .
+.Pa /etc/ifconfig.xxN .
 If this variable is equal to
 .Dq dhcp ,
 .Xr dhcpcd 8
 is started for the interface.
 Otherwise the contents of the file or the variable are handed to ifconfig
 after the interface name.
 If
 .Sy auto_ifconfig
 is set to "NO" and neither the file nor the variable is found,
 a warning is printed.
 Information in either the variable or the file is parsed identically,
 except that, if an
 .Sy ifconfig_xxN
 variable contains a single line with embedded semicolons,
 then the value is split into multiple lines prior to further parsing,
 treating the semicolon as a line separator.
 One common case it to set
 .Sy ifconfig_xxN Ns Li \&= Ns Qq dhcp ,
 which will cause
 .Xr dhcpcd 8
 to be started for the interface.
 Another common case it to set the
 .Sy ifconfig_xxN
 variable to a set of arguments to be passed to an
 .Xr ifconfig 8
 command after the interface name.
 Refer to
 .Xr ifconfig.if 5
 for more details on
-.Pa /etc/ifconfig.xxN .
+.Pa /etc/ifconfig.xxN
 files, and note that the information there also applies to
 .Sy ifconfig_xxN
 variables (after the variables are split into lines).
 .It Sy ntpdate
 .Sq YES
 or
 .Sq NO .
 Runs
 .Xr ntpdate 8
 to set the system time from one of the hosts in
 .Sy ntpdate_hosts .
 If
 .Sy ntpdate_hosts
 is empty, it will attempt to find a list of hosts in
 .Pa /etc/ntp.conf .
 Passes