From owner-cvs-src@FreeBSD.ORG Tue Mar 21 19:42:32 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAF8B16A41F; Tue, 21 Mar 2006 19:42:32 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F23443D48; Tue, 21 Mar 2006 19:42:32 +0000 (GMT) (envelope-from emax@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LJgWoX075560; Tue, 21 Mar 2006 19:42:32 GMT (envelope-from emax@repoman.freebsd.org) Received: (from emax@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LJgWLW075559; Tue, 21 Mar 2006 19:42:32 GMT (envelope-from emax) Message-Id: <200603211942.k2LJgWLW075559@repoman.freebsd.org> From: Maksim Yevmenkin Date: Tue, 21 Mar 2006 19:42:32 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/etc devd.conf src/etc/rc.d syscons X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 19:42:32 -0000 emax 2006-03-21 19:42:32 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) etc devd.conf etc/rc.d syscons Log: MFC: Reorganize /etc/rc.d/syscons and move all keyboard related settings into one function syscons_configure_keyboard(). Call new function from both syscons_start() and sysconst_setkeyboard(). The reason for this is because syscons_start() will (re)configure both keyboard and screen settings. Apparently, some graphics cards have problems with running vidcontrol(1) while X11 is running. Remove "/etc/rc.d/syscons restart" from /etc/devd.conf. It is no longer required. Using "/etc/rc.d/syscons setkeyboard" is enough. This also should fix annoying "syscons not running?" message. Tested by: Ulrich Spoerlein < q at galgenberg dot net > Approved by: re (hrs) Revision Changes Path 1.26.2.4 +1 -1 src/etc/devd.conf 1.13.2.2 +56 -46 src/etc/rc.d/syscons