From 94b08a9445500cce5f1d778e72fa4580ff2d2b99 Mon Sep 17 00:00:00 2001 From: Marco S Hyman Date: Mon, 6 Jan 2003 20:40:40 +0000 Subject: Handle wsconsctl.conf entries that contain spaces, e.g. keyboard.map+="keysym Caps_Lock = Control_L" OK fgs@ --- etc/rc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/rc b/etc/rc index a97aad90327..662bf90ee70 100644 --- a/etc/rc +++ b/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.213 2003/01/03 18:39:58 miod Exp $ +# $OpenBSD: rc,v 1.214 2003/01/06 20:40:39 marc Exp $ # System startup script run by init on autoboot # or after single-user. @@ -544,12 +544,16 @@ fi echo '.' -if [ -f /etc/wsconsctl.conf ]; then +if [ -x /sbin/wsconsctl -a -f /etc/wsconsctl.conf ]; then ( # delete comments and blank lines + saveIFS=$IFS + IFS=" +" set -- `stripcom /etc/wsconsctl.conf` + IFS=$save_IFS while [ $# -ge 1 ] ; do - wsconsctl -w $1 + eval /sbin/wsconsctl -w $1 shift done ) -- cgit v1.2.3