summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-03-14 22:48:47 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-03-14 22:48:47 +0000
commit39a73da6f1a3248d8225b2290f64a489bcf01a4a (patch)
tree36f2bc6b6612fecd2c10ee89269f4003c4197820
parent4f54342c387e7b655add7cb200de348902b6e29b (diff)
move wsconsctl up earlier, so that any key changes made can be used
to (for instance) interrupt dhclient with a ^C instead of a 'CAPS-LOCK C' from e@molioner.dk checked by matthieu
-rw-r--r--etc/rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index 392499a4868..aeea4fa91d1 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.278 2006/03/12 20:07:48 otto Exp $
+# $OpenBSD: rc,v 1.279 2006/03/14 22:48:46 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -213,6 +213,8 @@ if [ -f /sbin/kbd -a -f /etc/kbdtype ]; then
kbd `cat /etc/kbdtype`
fi
+wsconsctl_conf
+
if [ X"${pf}" != X"NO" ]; then
RULES="block all"
RULES="$RULES\npass on lo0"
@@ -691,8 +693,6 @@ fi
echo '.'
-wsconsctl_conf
-
mixerctl_conf
# KerberosV master KDC