Module Name: src
Committed By: wiz
Date: Tue Jul 22 17:11:09 UTC 2014
Modified Files:
src/etc: daily locate.conf rc.subr services
src/etc/defaults: rc.conf
src/etc/rc.d: mountall mountcritlocal mountcritremote random_seed
Log Message:
'file system' for consistency with documentation (instead of 'filesystem').
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/etc/daily
cvs rdiff -u -r1.1 -r1.2 src/etc/locate.conf
cvs rdiff -u -r1.92 -r1.93 src/etc/rc.subr
cvs rdiff -u -r1.97 -r1.98 src/etc/services
cvs rdiff -u -r1.122 -r1.123 src/etc/defaults/rc.conf
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/mountall src/etc/rc.d/mountcritremote
cvs rdiff -u -r1.13 -r1.14 src/etc/rc.d/mountcritlocal
cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/random_seed
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.90 src/etc/daily:1.91
--- src/etc/daily:1.90 Sun Sep 8 08:19:40 2013
+++ src/etc/daily Tue Jul 22 17:11:09 2014
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.90 2013/09/08 08:19:40 prlw1 Exp $
+# $NetBSD: daily,v 1.91 2014/07/22 17:11:09 wiz Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -248,7 +248,7 @@ fi
if checkyesno run_fsck; then
echo ""
- echo "Checking filesystems:"
+ echo "Checking file systems:"
fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase'
fi
Index: src/etc/locate.conf
diff -u src/etc/locate.conf:1.1 src/etc/locate.conf:1.2
--- src/etc/locate.conf:1.1 Fri Feb 6 15:24:25 2004
+++ src/etc/locate.conf Tue Jul 22 17:11:09 2014
@@ -1,11 +1,11 @@
-# $NetBSD: locate.conf,v 1.1 2004/02/06 15:24:25 itohy Exp $
+# $NetBSD: locate.conf,v 1.2 2014/07/22 17:11:09 wiz Exp $
#
# This file is read by /usr/libexec/locate.updatedb when building locate(1)
# database.
#
# argument description default
# searchpath <paths> search path /
-# ignorefs <fs types> ignore filesystems of the types !local cd9660
+# ignorefs <fs types> ignore file systems of the types !local cd9660
# Setting <fs types> to "none" fdesc kernfs
# disables it (search everything). procfs
# Prepending ! negates the meaning
Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.92 src/etc/rc.subr:1.93
--- src/etc/rc.subr:1.92 Mon Dec 17 18:17:27 2012
+++ src/etc/rc.subr Tue Jul 22 17:11:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.92 2012/12/17 18:17:27 apb Exp $
+# $NetBSD: rc.subr,v 1.93 2014/07/22 17:11:09 wiz Exp $
#
# Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -112,7 +112,7 @@ stop_boot()
#
# mount_critical_filesystems type
-# Go through the list of critical filesystems as provided in
+# Go through the list of critical file systems as provided in
# the rc.conf(5) variable $critical_filesystems_${type}, checking
# each one to see if it is mounted, and if it is not, mounting it.
# It's not an error if file systems prefixed with "OPTIONAL:"
@@ -1047,7 +1047,7 @@ handle_fsck_error()
echo "File system still has errors; re-run fsck manually!"
;;
4) # Root modified
- echo "Root filesystem was modified, rebooting ..."
+ echo "Root file system was modified, rebooting ..."
reboot -n
echo "Reboot failed; help!"
;;
Index: src/etc/services
diff -u src/etc/services:1.97 src/etc/services:1.98
--- src/etc/services:1.97 Thu Mar 21 17:45:03 2013
+++ src/etc/services Tue Jul 22 17:11:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: services,v 1.97 2013/03/21 17:45:03 christos Exp $
+# $NetBSD: services,v 1.98 2014/07/22 17:11:09 wiz Exp $
# See also: services(5), http://www.sethwklein.net/projects/iana-etc/
#
# Last Updated
@@ -19742,7 +19742,7 @@ chat 531/udp
uucpd 540/tcp
uucpd 540/udp
rdist 541/tcp rdistd
-rfs_server 556/tcp rfs # Brunhoff remote filesystem
+rfs_server 556/tcp rfs # Brunhoff remote file system
smtps 465/tcp # smtp protocol over TLS/SSL
smtps 465/udp # smtp protocol over TLS/SSL
kdc 750/tcp kerberos4
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.122 src/etc/defaults/rc.conf:1.123
--- src/etc/defaults/rc.conf:1.122 Sun Jan 13 18:47:57 2013
+++ src/etc/defaults/rc.conf Tue Jul 22 17:11:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.122 2013/01/13 18:47:57 prlw1 Exp $
+# $NetBSD: rc.conf,v 1.123 2014/07/22 17:11:09 wiz Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -42,7 +42,7 @@ rc_silent_cmd=twiddle
rc_rcorder_flags=""
# The directories searched for rc scripts.
-# These directories must be part of the root filesystem.
+# These directories must be part of the root file system.
rc_directories=/etc/rc.d
# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
@@ -140,7 +140,7 @@ rtclocaltime=NO
# NOTE: default coredump name now set in /etc/sysctl.conf
#
-# File system check flags; default to preen mode, checking filesystems
+# File system check flags; default to preen mode, checking file systems
# that are listed in /etc/fstab in parallel as the fsck pass number
# permits. Fix minor faults automatically, and exit with non 0 only
# when major errors occur.
Index: src/etc/rc.d/mountall
diff -u src/etc/rc.d/mountall:1.8 src/etc/rc.d/mountall:1.9
--- src/etc/rc.d/mountall:1.8 Sun Oct 18 21:58:37 2009
+++ src/etc/rc.d/mountall Tue Jul 22 17:11:09 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountall,v 1.8 2009/10/18 21:58:37 haad Exp $
+# $NetBSD: mountall,v 1.9 2014/07/22 17:11:09 wiz Exp $
#
# REQUIRE: mountcritremote named ypbind
@@ -14,7 +14,7 @@ stop_cmd="mountall_stop"
mountall_start()
{
- echo 'Mounting all filesystems...'
+ echo 'Mounting all file systems...'
if [ -f /etc/zfs/zpool.cache ]; then
# Get ZFS module loaded (and thereby, zvols created).
zfs list > /dev/null 2>&1
@@ -32,7 +32,7 @@ mountall_start()
mountall_stop()
{
- echo 'Unmounting all filesystems...'
+ echo 'Unmounting all file systems...'
if [ -f /etc/zfs/zpool.cache ]; then
# Unmount ZFS file systems.
zfs unmount -a
Index: src/etc/rc.d/mountcritremote
diff -u src/etc/rc.d/mountcritremote:1.8 src/etc/rc.d/mountcritremote:1.9
--- src/etc/rc.d/mountcritremote:1.8 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/mountcritremote Tue Jul 22 17:11:09 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritremote,v 1.8 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: mountcritremote,v 1.9 2014/07/22 17:11:09 wiz Exp $
#
# PROVIDE: mountcritremote
@@ -14,7 +14,7 @@ stop_cmd=":"
mountcritremote_start()
{
- # Mount critical filesystems that may be `remote'.
+ # Mount critical file systems that may be `remote'.
# (as specified in $critical_filesystems_remote)
# This usually includes /usr.
#
Index: src/etc/rc.d/mountcritlocal
diff -u src/etc/rc.d/mountcritlocal:1.13 src/etc/rc.d/mountcritlocal:1.14
--- src/etc/rc.d/mountcritlocal:1.13 Thu Jan 13 22:30:09 2011
+++ src/etc/rc.d/mountcritlocal Tue Jul 22 17:11:09 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritlocal,v 1.13 2011/01/13 22:30:09 haad Exp $
+# $NetBSD: mountcritlocal,v 1.14 2014/07/22 17:11:09 wiz Exp $
#
# PROVIDE: mountcritlocal
@@ -14,7 +14,7 @@ stop_cmd=":"
mountcritlocal_start()
{
- # Mount critical filesystems that are `local'
+ # Mount critical file systems that are `local'
# (as specified in $critical_filesystems_local)
# This usually includes /var.
#
Index: src/etc/rc.d/random_seed
diff -u src/etc/rc.d/random_seed:1.6 src/etc/rc.d/random_seed:1.7
--- src/etc/rc.d/random_seed:1.6 Sat Dec 29 22:15:07 2012
+++ src/etc/rc.d/random_seed Tue Jul 22 17:11:09 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: random_seed,v 1.6 2012/12/29 22:15:07 christos Exp $
+# $NetBSD: random_seed,v 1.7 2014/07/22 17:11:09 wiz Exp $
#
# PROVIDE: random_seed
@@ -42,7 +42,7 @@ getfstype() {
fs_safe()
{
#
- # Enforce that the file's on a local filesystem.
+ # Enforce that the file's on a local file system.
# Include only the types we can actually write.
#
fstype="$(getfstype "$1")"
@@ -51,7 +51,7 @@ fs_safe()
return 0
;;
*)
- message "Bad filesystem type ${fstype}"
+ message "Bad file system type ${fstype}"
return 1
;;
esac
