[src/trunk]: src/etc Make sure that warning message starts from the beginning...

[enami <enami%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c51313f631ca
branches:  trunk
changeset: 480231:c51313f631ca
user:      enami <enami%NetBSD.org@localhost>
date:      Fri Jan 07 05:25:45 2000 +0000

description:
Make sure that warning message starts from the beginning of line.  Some
warning recently added didn't care about it.

diffstat:

 etc/rc |  21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diffs (77 lines):

diff -r 030813990655 -r c51313f631ca etc/rc
--- a/etc/rc    Fri Jan 07 05:13:08 2000 +0000
+++ b/etc/rc    Fri Jan 07 05:25:45 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc,v 1.140 2000/01/07 05:11:43 enami Exp $
+#      $NetBSD: rc,v 1.141 2000/01/07 05:25:45 enami Exp $
 #      originally from: @(#)rc 8.2 (Berkeley) 3/17/94
 
 # System startup script run by init on autoboot
@@ -267,8 +267,11 @@
 fi
 
 if checkyesno ypserv; then
-       checkyesno portmap || \
-       logger -s "WARNING: set portmap=YES in /etc/rc.conf if ypserv=YES."
+       if ! checkyesno portmap; then
+               echo
+               logger -s "WARNING: set portmap=YES in /etc/rc.conf " \
+                   "if ypserv=YES."
+       fi
 
        echo -n ' ypserv';              ypserv $ypserv_flags
 fi
@@ -278,8 +281,11 @@
 fi
 
 if checkyesno yppasswdd; then
-       checkyesno ypserv || \
-       logger -s "WARNING: set ypserv=YES in /etc/rc.conf if yppasswdd=YES."
+       if ! checkyesno ypserv; then
+               echo
+               logger -s "WARNING: set ypserv=YES in /etc/rc.conf " \
+                   "if yppasswdd=YES."
+       fi
 
        echo -n ' rpc.yppasswdd';       rpc.yppasswdd $yppasswdd_flags
 fi
@@ -313,6 +319,7 @@
        echo -n 'starting nfs daemons:'
 
        if checkyesno nfs_server && ! checkyesno portmap; then
+               echo
                logger -s "WARNING: set portmap=YES in /etc/rc.conf " \
                    "if nfs_server=YES."
        fi
@@ -452,7 +459,6 @@
                echo 'turning on accounting'
                accton /var/account/acct
        else
-               echo
                logger -s "WARNING: /var/account/acct doesn't exist; " \
                    "accounting not enabled."
        fi
@@ -478,6 +484,7 @@
        if [ -r /etc/gated.conf ]; then
                echo -n ' gated';               gated $gated_flags
        else
+               echo
                logger -s "WARNING: no /etc/gated.conf; gated not started."
        fi
 fi
@@ -496,6 +503,7 @@
 
 if checkyesno rtsold; then
        if checkyesno ip6forwarding; then
+               echo
                logger -s "WARNING: rtsold cannot be used on IPv6 router."
        else
                echo -n ' rtsold';      rtsold $rtsold_flags
@@ -506,6 +514,7 @@
        if checkyesno ip6forwarding; then
                echo -n ' rtadvd';      rtadvd $rtadvd_flags
        else
+               echo
                logger -s "WARNING: rtadvd cannot be used on IPv6 host."
        fi
 fi