Date: Fri, 17 Jan 2020 19:07:37 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523353 - in head/x11/xdm: . files Message-ID: <202001171907.00HJ7b46028749@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Fri Jan 17 19:07:36 2020 New Revision: 523353 URL: https://svnweb.freebsd.org/changeset/ports/523353 Log: x11/xdm: minor fixes When testing, the rc script worked fine on my machine with no extra ttys, but when on a default installation with several vtys it conflicts with ttyv1. This script defaults to activating on ttyv8 as this is the one xdm usually is on by default and is the usual Ctrl+Alt+F9 for X. Add missed PORTREVISION (thanks mat) Modified: head/x11/xdm/Makefile head/x11/xdm/files/xdm.in Modified: head/x11/xdm/Makefile ============================================================================== --- head/x11/xdm/Makefile Fri Jan 17 19:07:16 2020 (r523352) +++ head/x11/xdm/Makefile Fri Jan 17 19:07:36 2020 (r523353) @@ -2,7 +2,7 @@ PORTNAME= xdm PORTVERSION= 1.1.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Modified: head/x11/xdm/files/xdm.in ============================================================================== --- head/x11/xdm/files/xdm.in Fri Jan 17 19:07:16 2020 (r523352) +++ head/x11/xdm/files/xdm.in Fri Jan 17 19:07:36 2020 (r523353) @@ -3,16 +3,21 @@ # $FreeBSD$ # # PROVIDE: xdm -# REQUIRE: LOGIN moused +# REQUIRE: LOGIN # KEYWORD: nojail shutdown # # Add the following line to /etc/rc.conf to enable xdm: # xdm_enable="YES" # +# Optionally, you can set the vty that it appears on +# (only useful in the unlikely event that you already have +# them allocated in /etc/ttys) +# xdm_tty=ttyv8 +# # Alternatively, edit /etc/ttys and change the line below -# ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure +# ttyv8 "%%PREFIX%%/bin/xdm -nodaemon" xterm off secure # to this: -# ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm on secure +# ttyv8 "%%PREFIX%%/bin/xdm -nodaemon" xterm on secure . /etc/rc.subr @@ -23,8 +28,17 @@ desc="X.org X display manager" load_rc_config $name : ${xdm_enable:=NO} +: ${xdm_tty:=ttyv8} command=%%PREFIX%%/bin/$name pidfile=/var/run/$name.pid +start_precmd=xdm_set_vty + +xdm_set_vty() +{ + # X views vt as starting at 01, not ttyv0 + vtarg=`printf vt%02d $((${xdm_tty#ttyv} + 1))` + command_args="-server \":0 local %%PREFIX%%/bin/X :0 $vtarg\"" +} run_rc_command $1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001171907.00HJ7b46028749>