Move xntpd -> rc.securelevel since tickadj need to twiddle /dev/mem

Move xdm back to rc.local; if your X server need access to /dev/mem
    and you do not use the ap driver starting xdm from rc.securelevel
    will only help the first time.
Add other rc.securelevel examples that are not daemons.

diff --git a/etc/rc.local b/etc/rc.local
index 0a593de..1179ac4 100644 (file)
--- a/etc/rc.local
+++ b/etc/rc.local
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.local,v 1.10 1997/04/15 09:26:47 deraadt Exp $
+#      $OpenBSD: rc.local,v 1.11 1997/05/04 20:46:07 millert Exp $
 
 # site-specific startup actions, daemons, and other things which
 # can be done AFTER your system goes into securemode.  For actions
@@ -18,9 +18,9 @@ echo -n 'starting local daemons:'
 #      echo -n ' sshd';        /usr/local/sbin/sshd
 #fi
 
-#if [ -x /usr/local/bin/xntpd ]; then
-#      /usr/local/sbin/tickadj -Aq
-#      echo -n ' xntpd';       /usr/local/sbin/xntpd
-#fi
+# Alternatively, xdm may be started in /etc/ttys.
+#if [ -x /usr/X11R6/bin/xdm ]; then
+#      echo -n ' xdm';         /usr/X11R6/bin/xdm
+#fi                                                                            
 
 echo '.'

diff --git a/etc/rc.securelevel b/etc/rc.securelevel
index c8b5e48..4d72816 100644 (file)
--- a/etc/rc.securelevel
+++ b/etc/rc.securelevel
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.securelevel,v 1.2 1997/04/29 07:47:20 dima Exp $
+#      $OpenBSD: rc.securelevel,v 1.3 1997/05/04 20:46:06 millert Exp $
 #
 # site-specific startup actions, daemons, and other things which
 # can be done BEFORE your system goes into securemode.  For actions
@@ -13,11 +13,25 @@
 # XXX
 securelevel=1
 
-echo -n 'starting pre-securelevel daemons:'
+echo 'starting pre-securelevel services:'
+
+# Use traditional BSD semantics with chown(2)
+#echo 'Enabling traditional BSD chown(2) semantics.'
+#sysctl -w fs.posix.setuid=0 >/dev/null 2>&1
 
-# Alternatively, xdm may be started in /etc/ttys.
-#if [ -x /usr/X11R6/bin/xdm ]; then
-#      echo -n ' xdm';         /usr/X11R6/bin/xdm
+# To run an accellerated X server when securelevel > 0 we must use /dev/ap.
+# NOTE: modload will panic your kernel if the booted kernel is not /bsd.
+#if [ -x /sbin/modload -a -x /usr/lkm/apinstall -a -r /usr/lkm/ap.o ]; then
+#      echo 'Installing XFree86 aperture driver.'
+#      rm -f /usr/lkm/ap
+#      modload -o /usr/lkm/ap -p /usr/lkm/apinstall -e ap /usr/lkm/ap.o
 #fi
 
+echo -n 'starting pre-securelevel daemons:'
+
+#if [ -x /usr/local/sbin/xntpd ]; then
+#       /usr/local/sbin/tickadj -Aq
+#       echo -n ' xntpd';       /usr/local/sbin/xntpd
+#fi                                                                            
+
 echo '.'