10 files changed, 39 insertions, 37 deletions

diff --git a/etc/etc.alpha/rc.alpha b/etc/etc.alpha/rc.alpha
index 882197aae971..202d76774e26 100644
--- a/etc/etc.alpha/rc.alpha
+++ b/etc/etc.alpha/rc.alpha
@@ -24,7 +24,7 @@ echo '.'
 kbddev=/dev/ttyv0
 viddev=/dev/ttyv0
 
-echo -n "rc.alpha configuring syscons:"
+echo -n 'rc.alpha configuring syscons:'
 
 # keymap
 #
@@ -62,7 +62,7 @@ case ${keychange} in
 [Nn][Oo] | '')
         ;;
 *)
-	echo -n " keychange"
+	echo -n ' keychange'
 	set - ${keychange}
 	while [ $# -gt 0 ]; do
 		kbdcontrol < ${kbddev} -f "$1" "$2"
diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386
index a4f6db9213d3..a90c8c6278ee 100644
--- a/etc/etc.i386/rc.i386
+++ b/etc/etc.i386/rc.i386
@@ -62,7 +62,7 @@ echo '.'
 kbddev=/dev/ttyv0
 viddev=/dev/ttyv0
 
-echo -n "rc.i386 configuring syscons:"
+echo -n 'rc.i386 configuring syscons:'
 
 # keymap
 #
@@ -100,7 +100,7 @@ case ${keychange} in
 [Nn][Oo] | '')
 	;;
 *)
-	echo -n " keychange"
+	echo -n ' keychange'
 	set - ${keychange}
 	while [ $# -gt 0 ]; do
 		kbdcontrol <${kbddev} -f "$1" "$2"
diff --git a/etc/netstart b/etc/netstart
index 041f1fe8646c..5771008a78a3 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -17,10 +17,10 @@ elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
-if [ -f /etc/rc.network ]; then
+if [ -r /etc/rc.network ]; then
 	. /etc/rc.network
 else
-	echo "Sorry, I can't find /etc/rc.network - aborting."
+	echo 'Sorry, I cannot find /etc/rc.network - aborting'
 	exit 1
 fi
 
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 15d01972ad71..cc796720e78c 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -31,7 +31,7 @@ start_dhcp() {
 	elif [ -r /usr/local/sbin/dhcpc ]; then
 		/usr/local/sbin/dhcpc $interface
 	else
-		echo "DHCP client software not available (isc-dhcp2)"
+		echo 'DHCP client software not available (isc-dhcp2)'
 	fi
 }
 
diff --git a/etc/rc.atm b/etc/rc.atm
index 834219b7a5fd..88e435409873 100644
--- a/etc/rc.atm
+++ b/etc/rc.atm
@@ -50,7 +50,7 @@ atm_pass1() {
 	done`
 
 	if [ -z "${atmdev}" ]; then
-		echo "No ATM adapters found."
+		echo 'No ATM adapters found'
 		return 0
 	fi
 
@@ -69,7 +69,7 @@ atm_pass1() {
 		if [ -n "${netif_args}" ]; then
 			atm set netif ${phy} ${netif_args} || continue
 		else
-			echo "missing network interface definition"
+			echo ' missing network interface definition'
 			continue
 		fi
 
@@ -90,7 +90,7 @@ atm_pass1() {
 		if [ -n "${sigmgr_args}" ]; then
 			atm attach ${phy} ${sigmgr_args} || continue
 		else
-			echo "missing signalling manager definition"
+			echo ' missing signalling manager definition'
 			continue
 		fi
 
@@ -98,7 +98,7 @@ atm_pass1() {
 		eval prefix_args=\$atm_prefix_${phy}
 		if [ `expr "${sigmgr_args}" : '[uU][nN][iI].*'` -ne 0 ]; then
 			if [ -z "${prefix_args}" ]; then
-				echo "missing NSAP prefix for UNI interface"
+				echo ' missing NSAP prefix for UNI interface'
 				continue
 			fi
 
@@ -113,19 +113,19 @@ atm_pass1() {
 		fi
 
 		atm_phy="${atm_phy} ${phy}"
-		echo "."
+		echo '.'
 	done
 
-	echo -n "Starting initial ATM daemons:"
+	echo -n 'Starting initial ATM daemons:'
 	# Start ILMI daemon (if needed)
 	case ${ilmid} in
 	1)
-		echo -n " ilmid"
+		echo -n ' ilmid'
 		ilmid
 		;;
 	esac
 
-	echo "."
+	echo '.'
 	atm_pass1_done=YES
 }
 
@@ -134,7 +134,7 @@ atm_pass1() {
 # N.B. /usr is not mounted.
 #
 atm_pass2() {
-	echo -n "Configuring ATM network interfaces:"
+	echo -n 'Configuring ATM network interfaces:'
 
 	atm_scspd=0
 	atm_atmarpd=""
@@ -165,7 +165,7 @@ atm_pass2() {
 				local)
 					;;
 				*)
-					echo "local arpserver required for SCSP"
+					echo ' local arpserver required for SCSP'
 					continue
 					;;
 				esac
@@ -175,7 +175,7 @@ atm_pass2() {
 			esac
 		done
 	done
-	echo "."
+	echo '.'
 
 	# Define any PVCs.
 	if [ -n "${atm_pvcs}" ]; then
@@ -202,14 +202,14 @@ atm_pass3() {
 	# Start SCSP daemon (if needed)
 	case ${atm_scspd} in
 	1)
-		echo -n " scspd"
+		echo -n ' scspd'
 		scspd
 		;;
 	esac
 
 	# Start ATMARP daemon (if needed)
 	if [ -n "${atm_atmarpd}" ]; then
-		echo -n " atmarpd"
+		echo -n ' atmarpd'
 		atmarpd ${atm_atmarpd}
 	fi
 
diff --git a/etc/rc.network b/etc/rc.network
index 229547a877ef..23751db67985 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -237,9 +237,9 @@ network_pass1() {
 	[Yy][Ee][Ss])
 		if [ "${firewall_in_kernel}" -eq 0 ] && kldload ipfw; then
 			firewall_in_kernel=1
-			echo "Kernel firewall module loaded."
+			echo 'Kernel firewall module loaded'
 		elif [ "${firewall_in_kernel}" -eq 0 ]; then
-			echo "Warning: firewall kernel module failed to load."
+			echo 'Warning: firewall kernel module failed to load'
 		fi
 		;;
 	esac
@@ -278,9 +278,9 @@ network_pass1() {
 				echo '.'
 
 			elif [ "`ipfw l 65535`" = "65535 deny ip from any to any" ]; then
-				echo -n "Warning: kernel has firewall functionality, "
-				echo "but firewall rules are not enabled."
-				echo "		 All ip services are disabled."
+				echo 'Warning: kernel has firewall functionality,' \
+				     'but firewall rules are not enabled.'
+				echo '		 All ip services are disabled.'
 			fi
 
 			case ${firewall_logging} in
@@ -441,7 +441,7 @@ network_pass1() {
 		;;
 	esac
 
-	echo -n 'routing daemons:'
+	echo -n 'Routing daemons:'
 	case ${router_enable} in
 	[Yy][Ee][Ss])
 		echo -n " ${router}";	${router} ${router_flags}
diff --git a/etc/rc.pccard b/etc/rc.pccard
index f6e1d0528319..45c6cc66e096 100644
--- a/etc/rc.pccard
+++ b/etc/rc.pccard
@@ -31,6 +31,8 @@
 
 case ${pccard_enable} in
 [Yy][Ee][Ss])
+	echo -n 'Enable PC-card:'
+
 	case ${pccard_mem} in
 	[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
 		pccardc pccardmem 0xd0000
@@ -48,7 +50,7 @@ case ${pccard_enable} in
 		pccardd_flags="${pccardd_flags} -f ${pccard_conf}"
 	fi
 
-	echo -n "Enable PC-card."
 	pccardd ${pccardd_flags} 2>&1 > /var/log/pccardd.debug
+	echo '.'
 	;;
 esac
diff --git a/etc/rc.resume b/etc/rc.resume
index a5d4cc454022..ee1b82c5d648 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -32,7 +32,7 @@
 if [ -r /var/run/rc.suspend.pid ]; then
 	kill -9 `cat /var/run/rc.suspend.pid`
 	rm -f /var/run/rc.suspend.pid
-	echo rc.suspend is killed
+	echo 'rc.suspend is killed'
 fi
 
 # Turns on a power supply of a card in the slot inactivated.
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index a54221a8a153..27fa38016567 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -61,7 +61,7 @@ reboot)
 	;;
 esac
 
-echo -n "Shutting down daemon processes:"
+echo -n 'Shutting down daemon processes:'
 
 # for each valid dir in $local_startup, search for init scripts matching *.sh
 case ${local_startup} in
diff --git a/etc/security b/etc/security
index ef4c5baf2508..5f4e7f8191f5 100644
--- a/etc/security
+++ b/etc/security
@@ -62,7 +62,7 @@ host=`hostname`
 
 umask 027
 
-echo "checking setuid files and devices:"
+echo 'Checking setuid files and devices:'
 
 # Don't have ncheck, but this does the equivalent of the commented out block.
 # Note that one of the original problems, the possibility of overrunning
@@ -81,7 +81,7 @@ done | xargs -0 -n 20 ls -liTd | sort +10 > ${TMP}
 if [ ! -f ${LOG}/setuid.today ]; then
 	[ $rc -lt 1 ] && rc=1
 	separator
-	echo "no ${LOG}/setuid.today"
+	echo "No ${LOG}/setuid.today"
 	cp ${TMP} ${LOG}/setuid.today || rc=3
 fi
 
@@ -101,7 +101,7 @@ if mount -p | $cmd > $TMP; then
 	if [ ! -f $LOG/mount.today ]; then
 		[ $rc -lt 1 ] && rc=1
 		separator
-		echo "no $LOG/mount.today"
+		echo "No $LOG/mount.today"
 		cp $TMP $LOG/mount.today || rc=3
 	fi
 	if ! cmp $LOG/mount.today $TMP >/dev/null 2>&1; then
@@ -115,7 +115,7 @@ if mount -p | $cmd > $TMP; then
 fi
 
 separator
-echo "checking for uids of 0:"
+echo 'Checking for uids of 0:'
 n=$(awk -F: '$3==0 {print $1,$3}' /etc/master.passwd |
     tee /dev/stderr |
     sed -e '/^root 0$/d' -e '/^toor 0$/d' |
@@ -123,7 +123,7 @@ n=$(awk -F: '$3==0 {print $1,$3}' /etc/master.passwd |
 [ $n -gt 0 -a $rc -lt 1 ] && rc=1
 
 separator
-echo "checking for passwordless accounts:"
+echo 'Checking for passwordless accounts:'
 n=$(awk -F: 'NF > 1 && $1 !~ /^[#+-]/ && $2=="" {print $0}' /etc/master.passwd |
     tee /dev/stderr | wc -l)
 [ $n -gt 0 -a $rc -lt 1 ] && rc=1
@@ -134,7 +134,7 @@ if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then
 	if [ ! -f ${LOG}/ipfw.today ]; then
 		[ $rc -lt 1 ] && rc=1
 		separator
-		echo "no ${LOG}/ipfw.today"
+		echo "No ${LOG}/ipfw.today"
 		cp ${TMP} ${LOG}/ipfw.today || rc=3
 	fi
 
@@ -157,7 +157,7 @@ if [ $? -eq 0 -a "${IPFW_LOG_LIMIT}" -ne 0 ]; then
 	if [ -s "${TMP}" ]; then
 		[ $rc -lt 1 ] && rc=1
 		separator
-		echo "ipfw log limit reached:"
+		echo 'ipfw log limit reached:'
 		cat ${TMP}
 	fi
 fi
@@ -168,7 +168,7 @@ if dmesg 2>/dev/null > ${TMP}; then
 	if [ ! -f ${LOG}/dmesg.today ]; then
 		[ $rc -lt 1 ] && rc=1
 		separator
-		echo "no ${LOG}/dmesg.today"
+		echo "No ${LOG}/dmesg.today"
 		cp ${TMP} ${LOG}/dmesg.today || rc=3
 	fi