Date: Sat, 10 Jan 2009 01:47:15 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r186993 - in projects/vap7/etc: . rc.d Message-ID: <200901100147.n0A1lFC6076022@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Sat Jan 10 01:47:15 2009 New Revision: 186993 URL: http://svn.freebsd.org/changeset/base/186993 Log: bring back quietstart stuff (r175676) Modified: projects/vap7/etc/ (props changed) projects/vap7/etc/rc projects/vap7/etc/rc.d/netif projects/vap7/etc/rc.subr Modified: projects/vap7/etc/rc ============================================================================== --- projects/vap7/etc/rc Sat Jan 10 01:22:23 2009 (r186992) +++ projects/vap7/etc/rc Sat Jan 10 01:47:15 2009 (r186993) @@ -56,7 +56,7 @@ if [ "$1" = autoboot ]; then rc_fast=yes # run_rc_command(): do fast booting else autoboot=no - _boot="start" + _boot="quietstart" fi dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` Modified: projects/vap7/etc/rc.d/netif ============================================================================== --- projects/vap7/etc/rc.d/netif Sat Jan 10 01:22:23 2009 (r186992) +++ projects/vap7/etc/rc.d/netif Sat Jan 10 01:47:15 2009 (r186993) @@ -95,7 +95,7 @@ network_start() if [ -f /etc/rc.d/ipfilter ] ; then # Resync ipfilter - /etc/rc.d/ipfilter resync + /etc/rc.d/ipfilter quietresync fi if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then /etc/rc.d/bridge start $cmdifn Modified: projects/vap7/etc/rc.subr ============================================================================== --- projects/vap7/etc/rc.subr Sat Jan 10 01:22:23 2009 (r186992) +++ projects/vap7/etc/rc.subr Sat Jan 10 01:47:15 2009 (r186993) @@ -381,9 +381,10 @@ wait_for_pids() # If argument has a given prefix, then change the operation as follows: # Prefix Operation # ------ --------- -# fast Skip the pid check, and set rc_fast=yes +# fast Skip the pid check, and set rc_fast=yes, rc_quiet=yes # force Set ${rcvar} to YES, and set rc_force=yes # one Set ${rcvar} to YES +# quiet Don't output some diagnostics, and set rc_quiet=yes # # The following globals are used: # @@ -526,6 +527,8 @@ wait_for_pids() # # rc_force Not empty if "force" was provided (q.v.) # +# rc_quiet Not empty if "quiet" was provided +# # run_rc_command() { @@ -546,6 +549,7 @@ run_rc_command() fast*) # "fast" prefix; don't check pid rc_arg=${rc_arg#fast} rc_fast=yes + rc_quiet=yes ;; force*) # "force prefix; always run rc_force=yes @@ -562,6 +566,11 @@ run_rc_command() eval ${rcvar}=YES fi ;; + quiet*) # "quiet" prefix; omit some messages + _rc_prefix=quiet + rc_arg=${rc_arg#${_rc_prefix}} + rc_quiet=yes + ;; esac eval _override_command=\$${name}_program @@ -610,6 +619,12 @@ run_rc_command() # if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then if ! checkyesno ${rcvar}; then + if [ -n "${rc_quiet}" ]; then + return 0 + fi + echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " + echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " + echo "instead of '${rc_arg}'." return 0 fi fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901100147.n0A1lFC6076022>