Add checks for pcnfsd (flag to mountd must be added in this case)

and Apache httpd, so a user can be brought up to speed quickly.

2 files changed, 27 insertions, 3 deletions

diff --git a/etc/rc b/etc/rc
index 1e6775389089..a8cc6de021f6 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.67 1995/06/25 04:01:32 bde Exp $
+#	$Id: rc,v 1.68 1995/07/20 16:26:25 wollman Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -209,7 +209,12 @@ if [ "X${rwhod}" = X"YES" ]; then
 fi
 
 if [ "X${nfs_server}" = X"YES" -a -r /etc/exports ]; then
-	echo -n ' mountd';		mountd
+	echo -n ' mountd'
+	if [ "X${pcnfsd}" = X"YES" ]; then
+		mountd -n
+	else
+		mountd
+	fi
 	echo -n ' nfsd';		nfsd -u -t 4
 fi
 
@@ -221,6 +226,16 @@ if [ "X${amdflags}" != X"NO" ]; then
 	echo -n ' amd';			amd ${amdflags}
 fi
 
+# These should go elsewhere but netstart is too early and I don't
+# want to touch rc.local, so...
+if [ "X${pcnfsd}" = X"YES" -a -x /usr/local/libexec/rpc.pcnfsd ]; then
+	echo -n ' rpc.pcnfsd'; /usr/local/libexec/rpc.pcnfsd &
+fi
+
+if [ "X${apache_httpd}" = X"YES" -a -x /usr/local/www/server/httpd ]; then
+	echo -n ' apache httpd'; /usr/local/www/server/httpd &
+fi
+
 # Kerberos runs ONLY on the Kerberos server machine
 if [ "X${kerberos_server}" = X"YES" ]; then
 	echo -n ' kerberos';	kerberos >> /var/log/kerberos.log &
diff --git a/etc/sysconfig b/etc/sysconfig
index c9724674d4bf..29328697d694 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,7 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.19 1995/08/10 16:25:57 ache Exp $
+#	$Id: sysconfig,v 1.20 1995/08/23 07:12:16 jkh Exp $
 
 ######################### Start Of Syscons Section #######################
 
@@ -143,6 +143,15 @@ yppasswddflags="NO"
 # For most hosts, flags should be "-b /etc/namedb/named.boot"
 namedflags="NO"
 
+# Set to YES if you run PC-NFSD (see /usr/ports/net/pcnfsd) for
+# sharing filesystems with DOS/Windows PCs.
+pcnfsd=NO
+
+# Set to YES if you have the Apache WEB server (see /sur/ports/net/apache)
+# installed and want to run it at system startup time (this is better than
+# running it from inetd if you're running a dedicated WWW server).
+apache_httpd=NO
+
 # Set to YES if you want to run the X-10 power controller daemon
 xtend=NO