summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-02-10 18:03:17 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-02-10 18:03:17 +0000
commit9fe669e78968736544dc01ad2f8124de021887ae (patch)
tree7f9e6395b5b64d5d90dfe895840907f7a49c5c5c /etc
parent9c4375525b7192db326e83cfbbfbc0be074fbdbf (diff)
install wscons.conf and rc.wscons on alpha/hppa/i386/powerpc and call it from rc
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile6
-rw-r--r--etc/rc7
2 files changed, 11 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 120e0ea8894..962d30906b7 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2001/01/21 15:11:18 itojun Exp $
+# $OpenBSD: Makefile,v 1.118 2001/02/10 18:03:16 mickey Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= US/Pacific
@@ -21,6 +21,10 @@ BIN1= bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
rc.securelevel rc.shutdown remote rpc security services \
shells syslog.conf weekly etc.${MACHINE}/disktab dhclient.conf \
mailer.conf
+.if ${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
+ ${MACHINE} == "i386" || ${MACHINE} == "powerpc"
+BIN1+=rc.wscons wscons.conf
+.endif
# -rw-rw-r--
BIN2= motd
diff --git a/etc/rc b/etc/rc
index 6f7c192ce93..7717fdf2238 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.161 2001/01/16 04:08:35 angelos Exp $
+# $OpenBSD: rc,v 1.162 2001/02/10 18:03:16 mickey Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -540,6 +540,11 @@ echo -n ' cron'; cron
echo '.'
+if [ -f /etc/rc.wscons -a -f /etc/wscons.conf ]; then
+ echo configuring wscons
+ /bin/sh /etc/rc.wscons
+fi
+
date
if [ "X${moused_flags}" != X"NO" -a -x /usr/sbin/moused ]; then