From owner-svn-src-stable-6@FreeBSD.ORG Fri May 14 19:57:19 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D869106564A; Fri, 14 May 2010 19:57:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6AB818FC19; Fri, 14 May 2010 19:57:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4EJvJWT055080; Fri, 14 May 2010 19:57:19 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4EJvJbr055061; Fri, 14 May 2010 19:57:19 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005141957.o4EJvJbr055061@svn.freebsd.org> From: Doug Barton Date: Fri, 14 May 2010 19:57:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208096 - in stable/6/etc: . defaults periodic/daily periodic/weekly rc.d X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2010 19:57:19 -0000 Author: dougb Date: Fri May 14 19:57:18 2010 New Revision: 208096 URL: http://svn.freebsd.org/changeset/base/208096 Log: MFC 208060: Remove trailing white space. No functional changes. Hand-delete trailing ws from rc.subr, rc.d/nsswitch, and rc.d/nfslocking while I'm here. Modified: stable/6/etc/defaults/rc.conf stable/6/etc/network.subr stable/6/etc/periodic/daily/310.accounting stable/6/etc/periodic/daily/440.status-mailq stable/6/etc/periodic/weekly/330.catman stable/6/etc/rc.d/bluetooth stable/6/etc/rc.d/bridge stable/6/etc/rc.d/cleanvar stable/6/etc/rc.d/geli stable/6/etc/rc.d/geli2 stable/6/etc/rc.d/mdconfig stable/6/etc/rc.d/mdconfig2 stable/6/etc/rc.d/nfslocking stable/6/etc/rc.d/nsswitch stable/6/etc/rc.d/rfcomm_pppd_server stable/6/etc/rc.d/syscons stable/6/etc/rc.initdiskless stable/6/etc/rc.subr Directory Properties: stable/6/etc/ (props changed) Modified: stable/6/etc/defaults/rc.conf ============================================================================== --- stable/6/etc/defaults/rc.conf Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/defaults/rc.conf Fri May 14 19:57:18 2010 (r208096) @@ -178,7 +178,7 @@ ifconfig_lo0="inet 127.0.0.1" # default #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry. # -#autobridge_interfaces="bridge0" # List of bridges to check +#autobridge_interfaces="bridge0" # List of bridges to check #autobridge_bridge0="tap* vlan0" # Interface glob to automatically add to the bridge # # If you have any sppp(4) interfaces above, you might also want to set Modified: stable/6/etc/network.subr ============================================================================== --- stable/6/etc/network.subr Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/network.subr Fri May 14 19:57:18 2010 (r208096) @@ -269,7 +269,7 @@ ifexists() } # ipv4_up if -# add IPv4 addresses to the interface $if +# add IPv4 addresses to the interface $if ipv4_up() { _if=$1 @@ -314,14 +314,14 @@ ipv4_down() # Evaluate the ifconfig_if_ipv4 arguments for interface $if # and use $action to add or remove IPv4 addresses from $if. ipv4_addrs_common() -{ +{ _ret=1 _if=$1 _action=$2 - + # get ipv4-addresses cidr_addr=`get_if_var $_if ipv4_addrs_IF` - + for _cidr in ${cidr_addr}; do _ipaddr=${_cidr%%/*} _netmask="/"${_cidr##*/} @@ -334,7 +334,7 @@ ipv4_addrs_common() if [ "${_action}" = "-alias" ]; then _netmask="" fi - + _ipcount=${_iplow} while [ "${_ipcount}" -le "${_iphigh}" ]; do eval "ifconfig ${_if} ${_action} ${_ipnet}.${_ipcount}${_netmask}" Modified: stable/6/etc/periodic/daily/310.accounting ============================================================================== --- stable/6/etc/periodic/daily/310.accounting Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/periodic/daily/310.accounting Fri May 14 19:57:18 2010 (r208096) @@ -29,7 +29,7 @@ case "$daily_accounting_enable" in cd /var/account rc=0 - + n=$daily_accounting_save rm -f acct.$n.gz acct.$n || rc=3 m=$n Modified: stable/6/etc/periodic/daily/440.status-mailq ============================================================================== --- stable/6/etc/periodic/daily/440.status-mailq Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/periodic/daily/440.status-mailq Fri May 14 19:57:18 2010 (r208096) @@ -59,7 +59,7 @@ case "$daily_status_mailq_enable" in fi;; esac fi;; - + *) rc=0;; esac Modified: stable/6/etc/periodic/weekly/330.catman ============================================================================== --- stable/6/etc/periodic/weekly/330.catman Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/periodic/weekly/330.catman Fri May 14 19:57:18 2010 (r208096) @@ -27,13 +27,13 @@ case "$weekly_catman_enable" in then if [ -z "${MANPATH}" ] then - echo "manpath failed to find any manpath directories" + echo "manpath failed to find any manpath directories" rc=3 else man_locales=`/usr/bin/manpath -qL` rc=0 - - # Preformat original, non-localized manpages + + # Preformat original, non-localized manpages echo /usr/libexec/catman.local -r "$MANPATH" | su -fm man || rc=3 Modified: stable/6/etc/rc.d/bluetooth ============================================================================== --- stable/6/etc/rc.d/bluetooth Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/bluetooth Fri May 14 19:57:18 2010 (r208096) @@ -94,7 +94,7 @@ bluetooth_setup_stack() hook=$1 shift - # Setup HCI + # Setup HCI ngctl mkpeer ${dev}: hci ${hook} drv \ > /dev/null 2>&1 || return 1 @@ -287,7 +287,7 @@ bluetooth_start() ;; esac - # Be backward compatible and setup reasonable defaults + # Be backward compatible and setup reasonable defaults bluetooth_device_authentication_enable="0" bluetooth_device_class="ff:01:0c" bluetooth_device_connectable="1" @@ -317,7 +317,7 @@ bluetooth_start() bluetooth_shutdown_stack $dev err 1 "Unable to setup Bluetooth stack for device ${dev}" fi - + return 0 } Modified: stable/6/etc/rc.d/bridge ============================================================================== --- stable/6/etc/rc.d/bridge Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/bridge Fri May 14 19:57:18 2010 (r208096) @@ -42,7 +42,7 @@ glob_int () { $2 ) true ;; * ) false ;; esac -} +} bridge_test () { bridge=$1 Modified: stable/6/etc/rc.d/cleanvar ============================================================================== --- stable/6/etc/rc.d/cleanvar Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/cleanvar Fri May 14 19:57:18 2010 (r208096) @@ -54,7 +54,7 @@ cleanvar_prestart() rm -f /var/run/clean_var /var/spool/lock/clean_var } -cleanvar_start () +cleanvar_start () { if [ -d /var/run -a ! -f /var/run/clean_var ]; then purgedir /var/run Modified: stable/6/etc/rc.d/geli ============================================================================== --- stable/6/etc/rc.d/geli Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/geli Fri May 14 19:57:18 2010 (r208096) @@ -11,7 +11,7 @@ # 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 AUTHORS AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE Modified: stable/6/etc/rc.d/geli2 ============================================================================== --- stable/6/etc/rc.d/geli2 Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/geli2 Fri May 14 19:57:18 2010 (r208096) @@ -11,7 +11,7 @@ # 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 AUTHORS AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE Modified: stable/6/etc/rc.d/mdconfig ============================================================================== --- stable/6/etc/rc.d/mdconfig Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/mdconfig Fri May 14 19:57:18 2010 (r208096) @@ -47,7 +47,7 @@ is_readonly() *" ${_mp} "*read-only*) echo "yes" ;; - + *) ;; esac; @@ -141,7 +141,7 @@ mdconfig_start() if ! eval ${_fsck_cmd} -p ${_dev} >/dev/null; then echo "Fsck failed on ${_dev}, not mounting the filesystem." continue - + fi else newfs ${_newfs} ${_dev} >/dev/null @@ -196,5 +196,5 @@ if [ -z "${_mdconfig_list}" ]; then fi done fi - + run_rc_command "${_mdconfig_cmd}" Modified: stable/6/etc/rc.d/mdconfig2 ============================================================================== --- stable/6/etc/rc.d/mdconfig2 Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/mdconfig2 Fri May 14 19:57:18 2010 (r208096) @@ -47,7 +47,7 @@ is_readonly() *" ${_mp} "*read-only*) echo "yes" ;; - + *) ;; esac; @@ -227,5 +227,5 @@ if [ -z "${_mdconfig2_list}" ]; then fi done fi - + run_rc_command "${_mdconfig2_cmd}" Modified: stable/6/etc/rc.d/nfslocking ============================================================================== --- stable/6/etc/rc.d/nfslocking Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/nfslocking Fri May 14 19:57:18 2010 (r208096) @@ -31,7 +31,7 @@ nfslocking_precmd() force_depend rpcbind || ret=1 fi - if [ $name = "statd" ] + if [ $name = "statd" ] then rc_flags=${rpc_statd_flags} elif [ $name = "lockd" ] Modified: stable/6/etc/rc.d/nsswitch ============================================================================== --- stable/6/etc/rc.d/nsswitch Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/nsswitch Fri May 14 19:57:18 2010 (r208096) @@ -58,7 +58,7 @@ convert_host_conf() *) printf "Warning: unrecognized line [%s]", $line > "/dev/stderr" ;; - + esac done < $host_conf Modified: stable/6/etc/rc.d/rfcomm_pppd_server ============================================================================== --- stable/6/etc/rc.d/rfcomm_pppd_server Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/rfcomm_pppd_server Fri May 14 19:57:18 2010 (r208096) @@ -46,7 +46,7 @@ rfcomm_pppd_server_start_profile() _channel=1 fi rc_flags="${rc_flags} -C ${_channel}" - + # Check for RFCOMM PPP profile register SP override # eval _x=\$rfcomm_pppd_server_${_profile_cleaned}_register_sp @@ -55,7 +55,7 @@ rfcomm_pppd_server_start_profile() rc_flags="${rc_flags} -S" fi fi - + # Check for RFCOMM PPP profile register DUN override # eval _x=\$rfcomm_pppd_server_${_profile_cleaned}_register_dun Modified: stable/6/etc/rc.d/syscons ============================================================================== --- stable/6/etc/rc.d/syscons Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.d/syscons Fri May 14 19:57:18 2010 (r208096) @@ -106,7 +106,7 @@ syscons_configure_keyboard() syscons_setkeyboard() { kbd=$1 - + if [ -z "${kbd}" ]; then return 1 fi Modified: stable/6/etc/rc.initdiskless ============================================================================== --- stable/6/etc/rc.initdiskless Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.initdiskless Fri May 14 19:57:18 2010 (r208096) @@ -105,7 +105,7 @@ # Similar to /conf/T/M/diskless_remount above, but allows # all of /conf to be remounted. This can be used to allow # multiple roots to share the same /conf. -# +# # # You will almost universally want to create the following files under /conf # Modified: stable/6/etc/rc.subr ============================================================================== --- stable/6/etc/rc.subr Fri May 14 19:36:11 2010 (r208095) +++ stable/6/etc/rc.subr Fri May 14 19:57:18 2010 (r208096) @@ -678,7 +678,7 @@ $command $rc_flags $command_args" if [ -n "$_nice" ]; then if [ -z "$_user" ]; then _doit="sh -c \"$_doit\"" - fi + fi _doit="nice -n $_nice $_doit" fi fi @@ -944,7 +944,7 @@ load_rc_config() ;; esac } - + # # load_rc_config_var name var # Read the rc.conf(5) var for name and set in the