Sat Sep 20 14:22:57 2008 UTC ()
remove an unecessary "eval"


(apb)
diff -r1.54 -r1.55 src/etc/rc.d/network

cvs diff -r1.54 -r1.55 src/etc/rc.d/network (expand / switch to unified diff)

--- src/etc/rc.d/network 2008/09/20 12:12:38 1.54
+++ src/etc/rc.d/network 2008/09/20 14:22:57 1.55
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: network,v 1.54 2008/09/20 12:12:38 apb Exp $ 3# $NetBSD: network,v 1.55 2008/09/20 14:22:57 apb Exp $
4# 4#
5 5
6# PROVIDE: network 6# PROVIDE: network
7# REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl 7# REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
8# BEFORE: NETWORKING 8# BEFORE: NETWORKING
9 9
10$_rc_subr_loaded . /etc/rc.subr 10$_rc_subr_loaded . /etc/rc.subr
11 11
12name="network" 12name="network"
13start_cmd="network_start" 13start_cmd="network_start"
14stop_cmd="network_stop" 14stop_cmd="network_stop"
15 15
16nl=' 16nl='
@@ -265,27 +265,27 @@ network_start() @@ -265,27 +265,27 @@ network_start()
265 # Run arbitrary command in a subshell. 265 # Run arbitrary command in a subshell.
266 ( eval "${args#*!}" ) 266 ( eval "${args#*!}" )
267 ;; 267 ;;
268 dhcp) 268 dhcp)
269 /sbin/dhcpcd -n ${dhcpcd_flags} $int 269 /sbin/dhcpcd -n ${dhcpcd_flags} $int
270 ;; 270 ;;
271 *) 271 *)
272 # Pass args to ifconfig. Note 272 # Pass args to ifconfig. Note
273 # that args may contain embedded 273 # that args may contain embedded
274 # shell metacharacters, such as 274 # shell metacharacters, such as
275 # "ssid 'foo;*>bar'". 275 # "ssid 'foo;*>bar'".
276 ( 276 (
277 set -o noglob 277 set -o noglob
278 eval set -- "$args" 278 set -- $args
279 #echo >&2 "[$#] [$1] [$2] [$3]" 279 #echo >&2 "[$#] [$1] [$2] [$3]"
280 /sbin/ifconfig $int "$@" 280 /sbin/ifconfig $int "$@"
281 ) 281 )
282 ;; 282 ;;
283 esac 283 esac
284 done 284 done
285 configured_interfaces="$configured_interfaces $int" 285 configured_interfaces="$configured_interfaces $int"
286 done 286 done
287 echo "." 287 echo "."
288 fi 288 fi
289 289
290 # Check $defaultroute, then /etc/mygate, for the name or address 290 # Check $defaultroute, then /etc/mygate, for the name or address
291 # of my IPv4 gateway host. If using a name, that name must be in 291 # of my IPv4 gateway host. If using a name, that name must be in