diff options
| -rw-r--r-- | etc/rc | 8 | ||||
| -rw-r--r-- | etc/rc.conf | 5 | ||||
| -rw-r--r-- | etc/rc.local | 7 |
3 files changed, 12 insertions, 8 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.70 1998/03/25 23:07:21 deraadt Exp $ +# $OpenBSD: rc,v 1.71 1998/04/07 06:11:52 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -416,4 +416,10 @@ fi . /etc/rc.local date + +# Alternatively, on some architectures, xdm may be started in /etc/ttys. +if [ "X${xdm_flags}" != X"NO" ]; then + echo 'starting xdm...'; /usr/X11R6/bin/xdm +fi + exit 0 diff --git a/etc/rc.conf b/etc/rc.conf index 9f1954826bb..38c2fc72409 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.18 1998/03/28 00:10:59 deraadt Exp $ +# $OpenBSD: rc.conf,v 1.19 1998/04/07 06:11:54 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for 'normal' use: routed_flags="-q" @@ -16,6 +16,9 @@ photurisd_flags=NO # for 'normal' use: photurisd_flags="" mopd_flags=NO # for 'normal' use: mopd_flags="-a" httpd_flags=NO # for 'normal' use: httpd_flags="" +# On some architectures, you must also disable console getty in /etc/ttys +xdm_flags=NO # for 'normal' use: xdm_flags="" + # set the following to "YES" to turn them on rwhod=NO nfs_server=NO diff --git a/etc/rc.local b/etc/rc.local index c062ce39240..d091af217df 100644 --- a/etc/rc.local +++ b/etc/rc.local @@ -1,4 +1,4 @@ -# $OpenBSD: rc.local,v 1.20 1998/03/25 07:25:22 deraadt Exp $ +# $OpenBSD: rc.local,v 1.21 1998/04/07 06:11:55 deraadt Exp $ # site-specific startup actions, daemons, and other things which # can be done AFTER your system goes into securemode. For actions @@ -32,9 +32,4 @@ fi # echo -n ' scon'; /usr/sbin/scon -t 300 #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 '.' |