From owner-svn-src-head@FreeBSD.ORG Tue Sep 9 14:18:57 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58B995A3; Tue, 9 Sep 2014 14:18:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B203A6; Tue, 9 Sep 2014 14:18:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89EIvt3087740; Tue, 9 Sep 2014 14:18:57 GMT (envelope-from ray@FreeBSD.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89EIujo087738; Tue, 9 Sep 2014 14:18:56 GMT (envelope-from ray@FreeBSD.org) Message-Id: <201409091418.s89EIujo087738@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ray set sender to ray@FreeBSD.org using -f From: Aleksandr Rybalko Date: Tue, 9 Sep 2014 14:18:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271312 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2014 14:18:57 -0000 Author: ray Date: Tue Sep 9 14:18:56 2014 New Revision: 271312 URL: http://svnweb.freebsd.org/changeset/base/271312 Log: Revert r269474. Special keyboard combinations should be handled by separate sysctls. Modified: head/sys/dev/vt/vt.h head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Tue Sep 9 14:09:51 2014 (r271311) +++ head/sys/dev/vt/vt.h Tue Sep 9 14:18:56 2014 (r271312) @@ -87,12 +87,6 @@ static int vt_##_name = _default; \ SYSCTL_INT(_kern_vt, OID_AUTO, _name, CTLFLAG_RWTUN, &vt_##_name, _default,\ _descr); -/* Allow to disable some special keys by users. */ -#define VT_DEBUG_KEY_ENABLED (1 << 0) -#define VT_REBOOT_KEY_ENABLED (1 << 1) -#define VT_HALT_KEY_ENABLED (1 << 2) -#define VT_POWEROFF_KEY_ENABLED (1 << 3) - struct vt_driver; void vt_allocate(struct vt_driver *, void *); Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Tue Sep 9 14:09:51 2014 (r271311) +++ head/sys/dev/vt/vt_core.c Tue Sep 9 14:18:56 2014 (r271312) @@ -122,9 +122,6 @@ VT_SYSCTL_INT(enable_altgr, 1, "Enable A VT_SYSCTL_INT(debug, 0, "vt(9) debug level"); VT_SYSCTL_INT(deadtimer, 15, "Time to wait busy process in VT_PROCESS mode"); VT_SYSCTL_INT(suspendswitch, 1, "Switch to VT0 before suspend"); -VT_SYSCTL_INT(spclkeys, (VT_DEBUG_KEY_ENABLED|VT_REBOOT_KEY_ENABLED| - VT_HALT_KEY_ENABLED|VT_POWEROFF_KEY_ENABLED), "Enabled special keys " - "handled by vt(4)"); static struct vt_device vt_consdev; static unsigned int vt_unit = 0; @@ -488,21 +485,17 @@ vt_machine_kbdevent(int c) switch (c) { case SPCLKEY | DBG: - if (vt_spclkeys & VT_DEBUG_KEY_ENABLED) - kdb_enter(KDB_WHY_BREAK, "manual escape to debugger"); + kdb_enter(KDB_WHY_BREAK, "manual escape to debugger"); return (1); case SPCLKEY | RBT: - if (vt_spclkeys & VT_REBOOT_KEY_ENABLED) - /* XXX: Make this configurable! */ - shutdown_nice(0); + /* XXX: Make this configurable! */ + shutdown_nice(0); return (1); case SPCLKEY | HALT: - if (vt_spclkeys & VT_HALT_KEY_ENABLED) - shutdown_nice(RB_HALT); + shutdown_nice(RB_HALT); return (1); case SPCLKEY | PDWN: - if (vt_spclkeys & VT_POWEROFF_KEY_ENABLED) - shutdown_nice(RB_HALT|RB_POWEROFF); + shutdown_nice(RB_HALT|RB_POWEROFF); return (1); };