===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** src/etc/rc	1998/02/18 14:05:27	1.66
--- src/etc/rc	1998/02/26 18:50:52	1.67
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.66 1998/02/18 14:05:27 art Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.67 1998/02/26 18:50:52 millert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 159,165 ****
  
  # $nfs_server is imported from /etc/rc.conf;
  # if $nfs_server == YES, the machine is setup for being an nfs server
! if [ X${nfs_server} = X"YES" -a -r /etc/exports -a \
      `cat /etc/exports | sed -e '/^#/d' | wc -l` -ne 0 ]; then
  	rm -f /var/db/mountdtab	
  	echo -n > /var/db/mountdtab
--- 159,165 ----
  
  # $nfs_server is imported from /etc/rc.conf;
  # if $nfs_server == YES, the machine is setup for being an nfs server
! if [ X${nfs_server} = X"YES" -a -s /etc/exports -a \
      `cat /etc/exports | sed -e '/^#/d' | wc -l` -ne 0 ]; then
  	rm -f /var/db/mountdtab	
  	echo -n > /var/db/mountdtab
***************
*** 176,182 ****
  	echo -n ' nfsiod';		nfsiod ${nfsiod_flags}
  fi
  
! if [ X${amd} = X"YES" -a -d ${amd_dir} -a -r ${amd_master} ]; then
  	echo -n ' amd'
  	amd -l syslog -x error,noinfo,nostats -p \
  	    -a ${amd_dir} `cat ${amd_master}` > /var/run/amd.pid
--- 176,182 ----
  	echo -n ' nfsiod';		nfsiod ${nfsiod_flags}
  fi
  
! if [ X${amd} = X"YES" -a -d ${amd_dir} -a -e ${amd_master} ]; then
  	echo -n ' amd'
  	amd -l syslog -x error,noinfo,nostats -p \
  	    -a ${amd_dir} `cat ${amd_master}` > /var/run/amd.pid
***************
*** 303,309 ****
  # $gated and $routed_flags are imported from /etc/rc.conf.
  # If $gated == YES, gated is used; otherwise routed.
  # If $routed_flags == NO, routed isn't run.
! if [ X${gated} = X"YES" -a -r /etc/gated.conf ]; then
  	echo -n ' gated';		gated $gated_flags
  elif [ "X${routed_flags}" != X"NO" ]; then
  	echo -n ' routed';		routed $routed_flags
--- 303,309 ----
  # $gated and $routed_flags are imported from /etc/rc.conf.
  # If $gated == YES, gated is used; otherwise routed.
  # If $routed_flags == NO, routed isn't run.
! if [ X${gated} = X"YES" -a -e /etc/gated.conf ]; then
  	echo -n ' gated';		gated $gated_flags
  elif [ "X${routed_flags}" != X"NO" ]; then
  	echo -n ' routed';		routed $routed_flags
***************
*** 330,336 ****
  # If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then
  # sendmail isn't run.  We call sendmail with a full path so that
  # SIGHUP works.
! if [ "X${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
  	echo -n ' sendmail';		/usr/sbin/sendmail ${sendmail_flags}
  fi
  
--- 330,336 ----
  # If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then
  # sendmail isn't run.  We call sendmail with a full path so that
  # SIGHUP works.
! if [ "X${sendmail_flags}" != X"NO" -a -s /etc/sendmail.cf ]; then
  	echo -n ' sendmail';		/usr/sbin/sendmail ${sendmail_flags}
  fi
  
***************
*** 348,368 ****
  # $rarpd_flags is imported from /etc/rc.conf;
  # If $rarpd_flags == NO or /etc/ethers doesn't exist, then
  # rarpd isn't run.
! if [ "X${rarpd_flags}" != X"NO" -a -r /etc/ethers ]; then
  	echo -n ' rarpd';		rarpd ${rarpd_flags}
  fi
  
  # $bootparamd_flags is imported from /etc/rc.conf;
  # If $bootparamd_flags == NO or /etc/bootparams doesn't exist, then
  # bootparamd isn't run.
! if [ "X${bootparamd_flags}" != X"NO" -a -r /etc/bootparams ]; then
  	echo -n ' rpc.bootparamd';	rpc.bootparamd ${bootparamd_flags}
  fi
  
  # $rbootd_flags is imported from /etc/rc.conf;
  # If $rbootd_flags == NO or /etc/rbootd.conf doesn't exist, then
  # rbootd isn't run.
! if [ "X${rbootd_flags}" != X"NO" -a -r /etc/rbootd.conf ]; then
  	echo -n ' rbootd';		rbootd ${rbootd_flags}
  fi
  
--- 348,368 ----
  # $rarpd_flags is imported from /etc/rc.conf;
  # If $rarpd_flags == NO or /etc/ethers doesn't exist, then
  # rarpd isn't run.
! if [ "X${rarpd_flags}" != X"NO" -a -s /etc/ethers ]; then
  	echo -n ' rarpd';		rarpd ${rarpd_flags}
  fi
  
  # $bootparamd_flags is imported from /etc/rc.conf;
  # If $bootparamd_flags == NO or /etc/bootparams doesn't exist, then
  # bootparamd isn't run.
! if [ "X${bootparamd_flags}" != X"NO" -a -s /etc/bootparams ]; then
  	echo -n ' rpc.bootparamd';	rpc.bootparamd ${bootparamd_flags}
  fi
  
  # $rbootd_flags is imported from /etc/rc.conf;
  # If $rbootd_flags == NO or /etc/rbootd.conf doesn't exist, then
  # rbootd isn't run.
! if [ "X${rbootd_flags}" != X"NO" -a -s /etc/rbootd.conf ]; then
  	echo -n ' rbootd';		rbootd ${rbootd_flags}
  fi