diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-09-23 15:39:57 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-09-23 15:39:57 +0000 |
| commit | f653d398a7dd6c6a94a42ffff510fadc5b04652e (patch) | |
| tree | 9357f7209bb516759a793b857471b75b1638005a | |
| parent | d192cf8ad7d3f05d9716c5f8cc3c80f6290c840a (diff) | |
Stricter patterns for numbered wsmouse and wskbd devices, so that
`wsmouse' and `wskbd' without suffixes match the wsmux rule.
Reported by Vadim Zhukov (persgray on gmail)
| -rw-r--r-- | etc/MAKEDEV.common | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common index cb2ac5021ba..62d9890879f 100644 --- a/etc/MAKEDEV.common +++ b/etc/MAKEDEV.common @@ -1,4 +1,4 @@ -vers(a, {-$OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.common,v 1.46 2009/09/23 15:39:56 miod Exp $-})dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> dnl @@ -350,14 +350,18 @@ _mkdev({-wsdisp-}, tty[C-J]*, {-U=${i##tty[C-J]} *) echo bad unit $U for $i; exit 1;; esac-})dnl __devitem(wskbd, wskbd*, wscons keyboards)dnl -_mkdev(wskbd, wskbd*, {-M wskbd$U c major_wskbd_c $U 600-})dnl +dnl XXX wskbd[0-9]* instead of wskbd* in case this appears before +dnl XXX ``wsmux|wsmouse|wskbd'' in the final MAKEDEV. +_mkdev(wskbd, wskbd[0-9]*, {-M wskbd$U c major_wskbd_c $U 600-})dnl __devitem(wsmux, wsmux, wscons keyboard/mouse mux devices)dnl _mkdev(wsmux, wsmux|wsmouse|wskbd, {-M wsmouse c major_wsmux_c 0 600 M wskbd c major_wsmux_c 1 600-})dnl __devitem(pcons, console, PROM console)dnl __devtitle(point, Pointing devices)dnl __devitem(wsmouse, wsmouse*, wscons mice)dnl -_mkdev(wsmouse, wsmouse*, {-M wsmouse$U c major_wsmouse_c $U 600-})dnl +dnl XXX wsmouse[0-9]* instead of wsmouse* in case this appears before +dnl XXX ``wsmux|wsmouse|wskbd'' in the final MAKEDEV. +_mkdev(wsmouse, wsmouse[0-9]*, {-M wsmouse$U c major_wsmouse_c $U 600-})dnl __devtitle(pty, Pseudo terminals)dnl __devitem(ptm, ptm, pty master device)dnl _mkdev(ptm, ptm, {-M ptm c major_ptm_c 0 666-})dnl |