diff options
| author |   kettenis <kettenis@openbsd.org> | 2016-01-11 22:00:16 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2016-01-11 22:00:16 +0000 |
| commit | 1509cb0f2cdb4293bf8c9e364ead326631b56fba (patch) | |
| tree | e6768473bf392b31c7cdc3e6f0a12e144589d9d0 | |
| parent | This adds the host_error output and the http code (when available) to the (diff) | |
| download | wireguard-openbsd-1509cb0f2cdb4293bf8c9e364ead326631b56fba.tar.xz wireguard-openbsd-1509cb0f2cdb4293bf8c9e364ead326631b56fba.zip | |
Add a "mux -1" locator to wsdisplay(4) instances representing secondary
displays. This makes sure the keyboard mux gets picked up by the primary
(console) display and that USB keyboards get paired with the console even
if they are not marked as the console keyboard. This is what most people
expect to happen. If you really want to associate your USB keyboard with
a secondary display, you can detach it from the mux using
wsconscfg -f /dev/ttyCcfg -k -d
and attach it to another display using
wsconscfg -f /dev/ttyDcfg -k
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 4e287c133d2..45103b778c2 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.408 2016/01/08 09:48:41 mpi Exp $ +# $OpenBSD: GENERIC,v 1.409 2016/01/11 22:00:16 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -315,12 +315,12 @@ agp* at intagp? drm0 at inteldrm? console 1 drm* at inteldrm? wsdisplay0 at inteldrm? console 1 -wsdisplay* at inteldrm? +wsdisplay* at inteldrm? mux -1 radeondrm* at pci? # ATI Radeon DRM driver drm0 at radeondrm? console 1 drm* at radeondrm? wsdisplay0 at radeondrm? console 1 -wsdisplay* at radeondrm? +wsdisplay* at radeondrm? mux -1 pcppi0 at isa? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 5e411e03f7c..212e08f3a65 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.810 2016/01/08 09:48:41 mpi Exp $ +# $OpenBSD: GENERIC,v 1.811 2016/01/11 22:00:16 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -380,12 +380,12 @@ agp* at intagp? drm0 at inteldrm? console 1 drm* at inteldrm? wsdisplay0 at inteldrm? console 1 -wsdisplay* at inteldrm? +wsdisplay* at inteldrm? mux -1 radeondrm* at pci? # ATI Radeon DRM driver drm0 at radeondrm? console 1 drm* at radeondrm? wsdisplay0 at radeondrm? console 1 -wsdisplay* at radeondrm? +wsdisplay* at radeondrm? mux -1 pcppi0 at isa? |