summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>1997-07-25 00:06:04 +0000
committerNiels Provos <provos@cvs.openbsd.org>1997-07-25 00:06:04 +0000
commitd1382193a77e975c669fdf16e05d47b22213a016 (patch)
tree10a4a687c20c0f7d21fb61ec6950c473da1d52a7 /etc
parent054fb7f6f636ebe47b3bb5c69b9a614770151bb6 (diff)
earlier start of keymanagement
Diffstat (limited to 'etc')
-rw-r--r--etc/netstart4
-rw-r--r--etc/rc16
2 files changed, 10 insertions, 10 deletions
diff --git a/etc/netstart b/etc/netstart
index 9225f9efb37..d70f8da4765 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.22 1997/07/24 22:11:59 deraadt Exp $
+# $OpenBSD: netstart,v 1.23 1997/07/25 00:06:03 provos Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=-q
@@ -11,7 +11,7 @@ rbootd_flags=NO # for 'normal' use: rbootd_flags=""
sendmail_flags=NO # for 'normal' use: sendmail_flags="-bd -q30m"
named_flags=NO # for 'normal' use: named_flags=""
timed_flags=NO # for 'normal' use: timed_flags=""
-photurisd_flags="-f" # for 'normal' use: photurisd_flags="-f"
+photurisd_flags="" # for 'normal' use: photurisd_flags=""
# set the following to "YES" to turn them on
rwhod=NO
diff --git a/etc/rc b/etc/rc
index d0b2d9ecc04..4b311de930e 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.39 1997/07/22 17:11:56 kstailey Exp $
+# $OpenBSD: rc,v 1.40 1997/07/25 00:06:02 provos Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -100,6 +100,13 @@ if [ X"${rfc1323}" = X"NO" ]; then
echo 'disabling rfc1323'; sysctl -w net.inet.tcp.rfc1323=0
fi
+# $photurisd_flags is imported from /etc/netstart;
+# If $photurisd_flags == NO or /etc/photuris/ doesn't exist, then
+# photurisd isn't run.
+if [ "X${photurisd_flags}" != X"NO" -a -d /etc/photuris ]; then
+ echo 'starting photurisd'; photurisd ${photurisd_flags}
+fi
+
# clean up left-over files
rm -f /etc/nologin
rm -f /var/spool/lock/LCK.*
@@ -312,13 +319,6 @@ if [ "X${rbootd_flags}" != X"NO" -a -r /etc/rbootd.conf ]; then
echo -n ' rbootd'; rbootd ${rbootd_flags}
fi
-# $photurisd_flags is imported from /etc/netstart;
-# If $photurisd_flags == NO or /etc/photuris/ doesn't exist, then
-# photurisd isn't run.
-if [ "X${photurisd_flags}" != X"NO" -a -d /etc/photuris ]; then
- echo -n ' photurisd'; photurisd ${photurisd_flags}
-fi
-
if [ -x /usr/sbin/screenblank ]; then
echo -n ' screenblank'; /usr/sbin/screenblank
fi