Date: Tue, 24 Jun 2008 01:30:19 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 144005 for review Message-ID: <200806240130.m5O1UJ3I064939@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=144005 Change 144005 by thompsa@thompsa_burger on 2008/06/24 01:29:20 IFC @144000 Affected files ... .. //depot/projects/vap/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/vap/contrib/top/top.X#3 integrate .. //depot/projects/vap/contrib/top/top.c#5 integrate .. //depot/projects/vap/etc/network.subr#13 integrate .. //depot/projects/vap/etc/pccard_ether#3 integrate .. //depot/projects/vap/etc/rc#4 integrate .. //depot/projects/vap/etc/rc.d/abi#3 integrate .. //depot/projects/vap/etc/rc.d/archdep#3 integrate .. //depot/projects/vap/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/vap/etc/rc.d/bgfsck#3 integrate .. //depot/projects/vap/etc/rc.d/cleartmp#3 integrate .. //depot/projects/vap/etc/rc.d/dumpon#3 integrate .. //depot/projects/vap/etc/rc.d/fsck#4 integrate .. //depot/projects/vap/etc/rc.d/hostid#5 integrate .. //depot/projects/vap/etc/rc.d/hostname#3 integrate .. //depot/projects/vap/etc/rc.d/ldconfig#4 integrate .. //depot/projects/vap/etc/rc.d/local#4 integrate .. //depot/projects/vap/etc/rc.d/localpkg#3 integrate .. //depot/projects/vap/etc/rc.d/lockd#4 integrate .. //depot/projects/vap/etc/rc.d/motd#4 integrate .. //depot/projects/vap/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/vap/etc/rc.d/mountlate#5 integrate .. //depot/projects/vap/etc/rc.d/moused#4 integrate .. //depot/projects/vap/etc/rc.d/netif#9 integrate .. //depot/projects/vap/etc/rc.d/netoptions#3 integrate .. //depot/projects/vap/etc/rc.d/newsyslog#4 integrate .. //depot/projects/vap/etc/rc.d/power_profile#4 integrate .. //depot/projects/vap/etc/rc.d/routing#5 integrate .. //depot/projects/vap/etc/rc.d/savecore#4 integrate .. //depot/projects/vap/etc/rc.d/statd#4 integrate .. //depot/projects/vap/etc/rc.d/swap1#4 integrate .. //depot/projects/vap/etc/rc.d/sysctl#4 integrate .. //depot/projects/vap/etc/rc.subr#6 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/vap/include/unistd.h#10 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#9 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#1 branch .. //depot/projects/vap/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/vap/lib/libc/gen/exec.3#4 integrate .. //depot/projects/vap/lib/libc/gen/exec.c#4 integrate .. //depot/projects/vap/lib/libc/gen/posix_spawn.c#2 integrate .. //depot/projects/vap/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#21 integrate .. //depot/projects/vap/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/vap/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/vap/sbin/natd/natd.8#6 integrate .. //depot/projects/vap/sbin/natd/natd.c#4 integrate .. //depot/projects/vap/sbin/natd/natd.h#3 integrate .. //depot/projects/vap/sbin/swapon/swapon.8#4 integrate .. //depot/projects/vap/sbin/swapon/swapon.c#4 integrate .. //depot/projects/vap/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/vap/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/vap/sys/dev/fe/if_fe_cbus.c#6 integrate .. //depot/projects/vap/sys/dev/fe/if_fe_isa.c#6 integrate .. //depot/projects/vap/sys/dev/fe/if_fe_pccard.c#7 integrate .. //depot/projects/vap/sys/dev/fe/if_fevar.h#7 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#29 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vap/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.c#9 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/vap/sys/pci/viapm.c#7 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/vap/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/vap/sys/vm/vm_kern.c#9 integrate .. //depot/projects/vap/sys/vm/vm_map.c#11 integrate .. //depot/projects/vap/tools/regression/fifo/fifo_create/fifo_create.c#3 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/test-scanfloat.c#4 integrate .. //depot/projects/vap/usr.bin/cpio/cmdline.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.h#2 integrate .. //depot/projects/vap/usr.bin/cpio/matching.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/test/main.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/test/test.h#2 integrate .. //depot/projects/vap/usr.sbin/powerd/powerd.8#3 integrate .. //depot/projects/vap/usr.sbin/powerd/powerd.c#4 integrate Differences ... ==== //depot/projects/vap/contrib/gdtoa/gethex.c#3 (text+ko) ==== @@ -113,8 +113,11 @@ e += e1; } *sp = (char*)s; - if (zret) - return havedig ? STRTOG_Zero : STRTOG_NoNumber; + if (zret) { + if (!havedig) + *sp = s0 - 1; + return STRTOG_Zero; + } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) k++; ==== //depot/projects/vap/contrib/top/top.X#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.21 2008/06/21 15:48:16 ru Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -10,7 +10,7 @@ .SH SYNOPSIS .B top [ -.B \-abCHIijnqStuv +.B \-abCHIijnPqStuv ] [ .BI \-d count ] [ @@ -119,6 +119,9 @@ Use \*(lqnon-interactive\*(rq mode. This is identical to \*(lqbatch\*(rq mode. .TP +.B \-P +Display per-cpu CPU usage statistics. +.TP .B \-q Renice .I top ==== //depot/projects/vap/contrib/top/top.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.26 2008/06/21 15:48:16 ru Exp $ */ /* @@ -283,7 +283,7 @@ optind = 1; } - while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijnquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -412,14 +412,10 @@ pcpu_stats = Yes; break; - case 'p': - pcpu_stats = No; - break; - default: fprintf(stderr, "Top version %s\n" -"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" +"Usage: %s [-abCHIijnPqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" " [-U username] [number]\n", version_string(), myname); exit(1); ==== //depot/projects/vap/etc/network.subr#13 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.189 2008/05/26 10:10:11 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ # # @@ -48,10 +48,6 @@ ipx_up ${ifn} && cfg=0 childif_create ${ifn} - if [ "$cfg" -eq 0 ]; then - ifconfig ${ifn} - fi - return $cfg } @@ -73,10 +69,6 @@ ifscript_down ${ifn} && cfg=0 childif_destroy ${ifn} - if [ "$cfg" -eq 0 ]; then - echo -n " ${ifn}" - fi - return $cfg } ==== //depot/projects/vap/etc/pccard_ether#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.54 2006/12/08 15:48:42 hrs Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.55 2008/06/23 20:50:11 mtm Exp $ # # pccard_ether interfacename [start|stop|restart] # @@ -78,7 +78,7 @@ done fi - /etc/rc.d/netif start $ifn + /etc/rc.d/netif quietstart $ifn # Do route configuration if needed. # XXX: should probably do this by calling rc.d/routing. @@ -99,7 +99,7 @@ fi fi - /etc/rc.d/netif stop $ifn + /etc/rc.d/netif quietstop $ifn # clean ARP table ifexists $ifn && arp -d -i $ifn -a ==== //depot/projects/vap/etc/rc#4 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.342 2008/06/23 04:18:22 mtm Exp $ # # System startup script run by init on autoboot @@ -69,7 +69,6 @@ # and to make the configuration file variables available to rc itself. # . /etc/rc.subr -echo "Loading configuration files." load_rc_config 'XXX' skip="-s nostart" ==== //depot/projects/vap/etc/rc.d/abi#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.11 2006/12/30 22:53:19 yar Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.12 2008/06/22 16:19:50 mtm Exp $ # # PROVIDE: abi @@ -45,13 +45,19 @@ abi_start() { - echo -n 'Additional ABI support:' + local _echostop + + _echostop= + if checkyesno sysvipc_enable || checkyesno linux_enable || checkyesno svr4_enable; then + echo -n 'Additional ABI support:' + _echostop=yes + fi checkyesno sysvipc_enable && sysv_start checkyesno linux_enable && linux_start checkyesno svr4_enable && svr4_start - echo '.' + [ -n "${_echostop}" ] && echo '.' } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/archdep#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.15 2008/06/22 15:57:50 mtm Exp $ # # PROVIDE: archdep @@ -13,37 +13,32 @@ start_cmd="archdep_start" stop_cmd=":" -# SCO binary emulation -# -ibcs2_compat() -{ - if checkyesno ibcs2_enable; then - echo -n ' ibcs2' - load_kld ibcs2 - case ${ibcs2_loaders} in - [Nn][Oo]) - ;; - *) - for i in ${ibcs2_loaders}; do - load_kld ibcs2_$i - done - ;; - esac - fi -} - archdep_start() { local _arch _arch=`${SYSCTL_N} hw.machine_arch` - echo -n "Initial $_arch initialization:" case $_arch in i386) - ibcs2_compat + # SCO binary emulation + # + if checkyesno ibcs2_enable; then + echo -n 'Initial i386 initialization:' + echo -n ' ibcs2' + load_kld ibcs2 + case ${ibcs2_loaders} in + [Nn][Oo]) + ;; + *) + for i in ${ibcs2_loaders}; do + load_kld ibcs2_$i + done + ;; + esac + echo '.' + fi ;; esac - echo '.' } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/auto_linklocal#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.5 2006/12/29 15:56:21 hrs Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.6 2008/06/23 22:06:28 mtm Exp $ # # PROVIDE: auto_linklocal @@ -18,7 +18,10 @@ auto_linklocal_start() { if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + if ! ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 >/dev/null 2>&1; then + warn "failed to set sysctl(8)" + return 1 + fi laddr=`network6_getladdr lo0` if [ -z "${laddr}" ]; then ifconfig lo0 inet6 fe80::1 prefixlen 64 ==== //depot/projects/vap/etc/rc.d/bgfsck#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.8 2007/03/11 06:53:06 brooks Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.9 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: bgfsck @@ -31,7 +31,7 @@ bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds" fi if [ -z "${rc_force}" ]; then - echo "${bgfsck_msg}." + [ -z "${rc_quiet}" ] && echo "${bgfsck_msg}." fi (sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \ ==== //depot/projects/vap/etc/rc.d/cleartmp#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.19 2008/06/23 04:42:58 mtm Exp $ # # PROVIDE: cleartmp @@ -25,7 +25,7 @@ ${tmp}/.ICE-unix ${tmp}/.font-unix" if checkyesno ${rcvar1}; then - echo "Clearing ${tmp}." + [ -z "${rc_quiet}" ] && echo "Clearing ${tmp}." # This is not needed for mfs, but doesn't hurt anything. # Things to note: @@ -44,7 +44,7 @@ elif checkyesno clear_tmp_X; then # Remove X lock files, since they will prevent you from # restarting X. Remove other X related directories. - echo "Clearing ${tmp} (X related)." + [ -z "${rc_quiet}" ] && echo "Clearing ${tmp} (X related)." rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} fi if checkyesno clear_tmp_X; then ==== //depot/projects/vap/etc/rc.d/dumpon#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.11 2005/12/10 20:21:45 dougb Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.12 2008/06/23 04:39:36 mtm Exp $ # # PROVIDE: dumpon @@ -15,11 +15,12 @@ dumpon_try() { - if /sbin/dumpon -v "${1}" ; then + if /sbin/dumpon "${1}" ; then # Make a symlink in devfs for savecore ln -fs "${1}" /dev/dumpdev return 0 fi + warn "unable to specify $1 as a dump device" return 1 } ==== //depot/projects/vap/etc/rc.d/fsck#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/fsck,v 1.12 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: fsck @@ -23,7 +23,7 @@ # During fsck ignore SIGQUIT trap : 3 - echo "Starting file system checks:" + [ -z "${rc_quiet}" ] && echo "Starting file system checks:" if checkyesno background_fsck; then fsck -F -p else ==== //depot/projects/vap/etc/rc.d/hostid#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostid,v 1.9 2008/05/06 10:40:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.10 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: hostid @@ -47,10 +47,12 @@ # Generate hostid based on hostuuid - take first four bytes from md5(uuid). id=`echo -n $uuid | /sbin/md5` id="0x${id%????????????????????????}" + # Set both kern.hostuuid and kern.hostid. - echo "Setting hostuuid: ${uuid}." + # + [ -z "${rc_quiet}" ] && echo "Setting hostuuid: ${uuid}." ${SYSCTL_W} kern.hostuuid="${uuid}" >/dev/null - echo "Setting hostid: ${id}." + [ -z "${rc_quiet}" ] && echo "Setting hostid: ${id}." ${SYSCTL_W} kern.hostid=${id} >/dev/null } ==== //depot/projects/vap/etc/rc.d/hostname#3 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.12 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: hostname @@ -72,7 +72,7 @@ # All right, it is safe to invoke hostname(1) now. # - echo "Setting hostname: ${hostname}." + [ -z "${rc_quiet}" ] && echo "Setting hostname: ${hostname}." /bin/hostname "${hostname}" } ==== //depot/projects/vap/etc/rc.d/ldconfig#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.20 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: ldconfig @@ -36,7 +36,7 @@ _LDC="${_LDC} ${i}" fi done - echo 'ELF ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} case `sysctl -n hw.machine_arch` in @@ -55,7 +55,8 @@ _LDC="${_LDC} ${i}" fi done - echo '32-bit compatibility ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && + echo '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 -m ${_ins} ${_LDC} ;; esac @@ -71,7 +72,8 @@ _LDC="${_LDC} ${i}" fi done - echo 'a.out ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && + echo 'a.out ldconfig path:' ${_LDC} ${ldconfig} -aout ${_ins} ${_LDC} ;; esac ==== //depot/projects/vap/etc/rc.d/local#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/local,v 1.7 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.8 2008/06/22 16:23:39 mtm Exp $ # # PROVIDE: local @@ -16,20 +16,20 @@ local_start() { - echo -n 'Starting local daemons:' if [ -f /etc/rc.local ]; then + echo -n 'Starting local daemons:' . /etc/rc.local + echo '.' fi - echo '.' } local_stop() { - echo -n 'Shutting down local daemons:' if [ -f /etc/rc.shutdown.local ]; then + echo -n 'Shutting down local daemons:' . /etc/rc.shutdown.local + echo '.' fi - echo '.' } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/localpkg#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localpkg,v 1.8 2006/02/12 10:04:56 matteo Exp $ +# $FreeBSD: src/etc/rc.d/localpkg,v 1.10 2008/06/23 03:49:30 mtm Exp $ # # PROVIDE: localpkg @@ -16,15 +16,21 @@ pkg_start() { + local initdone + # For each dir in $local_startup, search for init scripts matching *.sh # case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Local package initialization:' + initdone= find_local_scripts_old for script in ${zlist} ${slist}; do + if [ -z "${initdone}" -a -f "${script}" ]; then + echo -n 'Local package initialization:' + initdone=yes + fi if [ -x "${script}" ]; then (set -T trap 'exit 1' 2 @@ -33,20 +39,26 @@ echo -n " (skipping ${script}, not executable)" fi done - echo '.' + [ -n "${initdone}" ] && echo '.' ;; esac } pkg_stop() { + local initdone + case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Shutting down daemon processes:' + initdone= find_local_scripts_old for script in `reverse_list ${slist} ${zlist}`; do + if [ -z "${initdone}" -a -f "${script}" ]; then + echo -n 'Shutting down local packages:' + initdone=yes + fi if [ -x "${script}" ]; then if [ `sysctl -n debug.bootverbose` -eq 1 ]; then echo "==>" ${script} @@ -56,7 +68,7 @@ ${script} stop) fi done - echo '.' + [ -n "${initdone}" ] && echo '.' ;; esac } ==== //depot/projects/vap/etc/rc.d/lockd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.19 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $ # # PROVIDE: lockd @@ -15,7 +15,7 @@ rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' +stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable' status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get @@ -26,7 +26,7 @@ local ret ret=0 - if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable + if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable then ret=1 fi ==== //depot/projects/vap/etc/rc.d/motd#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/motd,v 1.10 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.11 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: motd @@ -22,13 +22,13 @@ # Must be done *before* interactive logins are possible # to prevent possible race conditions. # - echo -n 'Updating motd' + [ -z "${rc_quiet}" ] && echo -n 'Updating motd:' if [ ! -f /etc/motd ]; then install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd fi if [ ! -w /etc/motd ]; then - echo ' ... /etc/motd is not writable, update failed.' + echo ' /etc/motd is not writable, update failed.' return fi @@ -42,7 +42,7 @@ } rm -f $T - echo . + [ -z "${rc_quiet}" ] && echo . } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/mountcritremote#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.19 2008/06/22 15:40:19 mtm Exp $ # # PROVIDE: mountcritremote @@ -36,9 +36,15 @@ { # Mount nfs filesystems. # - echo -n 'Mounting NFS file systems:' - mount -a -t nfs - echo '.' + case "`/sbin/mount -d -a -t nfs`" in + '') + ;; + *) + echo -n 'Mounting NFS file systems:' + mount -a -t nfs + echo '.' + ;; + esac # Mount other network filesystems if present in /etc/fstab. case ${extra_netfs_types} in ==== //depot/projects/vap/etc/rc.d/mountlate#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.6 2008/06/22 15:40:19 mtm Exp $ # # PROVIDE: mountlate @@ -16,13 +16,24 @@ mountlate_start() { - local err + local err latefs # Mount "late" filesystems. - echo -n 'Mounting late file systems:' - mount -a -l - err=$? - echo '.' + # + err=0 + latefs= + # / (root) fs is always remounted, so remove from list + latefs="`/sbin/mount -d -a -l | grep -v ' /$'`" + case ${latefs} in + '') + ;; + *) + echo -n 'Mounting late file systems:' + mount -a -l + err=$? + echo '.' + ;; + esac case ${err} in 0) ==== //depot/projects/vap/etc/rc.d/moused#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/moused,v 1.12 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: moused @@ -51,7 +51,7 @@ mytype="$moused_type" fi - echo -n "Starting ${ms} moused:" + [ -z "${rc_quiet}" ] && echo -n "Starting ${ms} moused." /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${pidarg} mousechar_arg= @@ -59,7 +59,6 @@ [Nn][Oo] | '') ;; *) - echo -n ' mousechar_start' mousechar_arg="-M ${mousechar_start}" ;; esac @@ -67,7 +66,6 @@ for ttyv in /dev/ttyv* ; do vidcontrol < ${ttyv} ${mousechar_arg} -m on done - echo '.' } run_rc_command $* ==== //depot/projects/vap/etc/rc.d/netif#9 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/netif,v 1.28 2008/05/18 02:57:54 brooks Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $ # # PROVIDE: netif @@ -85,11 +85,8 @@ # cmdifn=$* - echo -n "Stopping network:" - # Deconfigure the interface(s) network_common ifn_stop - echo '.' } # network_common routine @@ -98,7 +95,7 @@ # an interface and then calls $routine. network_common() { - local _cooked_list _fail _func + local _cooked_list _fail _func _ok _str _func= @@ -123,12 +120,31 @@ fi _fail= + _ok= for ifn in ${_cooked_list}; do - if ! ${_func} ${ifn} $2; then + if ${_func} ${ifn} $2; then + _ok="${_ok} ${ifn}" + else _fail="${_fail} ${ifn}" fi done + _str= + if [ -n "${_ok}" ]; then + case ${_func} in + ifn_start) + _str='Starting' + ;; + ifn_stop) + _str='Stopping' + ;; + esac + echo "${_str} Network:${_ok}." + if [ -z "${rc_quiet}" ]; then + /sbin/ifconfig ${_ok} + fi + fi + debug "The following interfaces were not configured: $_fail" } ==== //depot/projects/vap/etc/rc.d/netoptions#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.146 2008/06/23 12:06:35 mtm Exp $ # # PROVIDE: netoptions @@ -9,9 +9,17 @@ . /etc/rc.subr +_netoptions_initdone= +netoptions_init() +{ + if [ -z "${_netoptions_initdone}" ]; then + echo -n 'Additional TCP/IP options:' + _netoptions_initdone=yes + fi +} + load_rc_config 'XXX' -echo -n 'Additional IP options:' case ${log_in_vain} in [Nn][Oo] | '') log_in_vain=0 @@ -22,21 +30,24 @@ [0-9]*) ;; *) + netoptions_init echo " invalid log_in_vain setting: ${log_in_vain}" log_in_vain=0 ;; esac -[ "${log_in_vain}" -ne 0 ] && ( +if [ "${log_in_vain}" -ne 0 ]; then + netoptions_init echo -n " log_in_vain=${log_in_vain}" sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null -) +fi case ${tcp_extensions} in [Yy][Ee][Ss] | '') ;; *) + netoptions_init echo -n ' tcp extensions=NO' sysctl net.inet.tcp.rfc1323=0 >/dev/null ;; @@ -44,6 +55,7 @@ case ${tcp_keepalive} in [Nn][Oo]) + netoptions_init echo -n ' TCP keepalive=NO' sysctl net.inet.tcp.always_keepalive=0 >/dev/null ;; @@ -51,6 +63,7 @@ case ${tcp_drop_synfin} in [Yy][Ee][Ss]) + netoptions_init echo -n ' drop SYN+FIN packets=YES' sysctl net.inet.tcp.drop_synfin=1 >/dev/null ;; @@ -60,6 +73,7 @@ [Nn][Oo] | '') ;; *) + netoptions_init >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806240130.m5O1UJ3I064939>