Date: Wed, 11 Oct 2023 05:27:48 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0c7256704da0 - main - x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args Message-ID: <202310110527.39B5RmPH086434@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c7256704da0778c1c685da54f50f8d42ed2cbf6 commit 0c7256704da0778c1c685da54f50f8d42ed2cbf6 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2023-10-05 20:26:46 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2023-10-11 05:26:05 +0000 x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args Hard coding Xserver args forces people to invoke xdm through init by placing an entry in /etc/ttys when Xserver args different from those hardcoded in rc.d/xdm are desired. Instead glean arguments from $LOCALBASE/etc/xdm/Xservers, defaulting to the hardcoded entry if none are found for :0. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42097 --- x11/xdm/Makefile | 2 +- x11/xdm/files/xdm.in | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 6dfb4290412b..65ab112a321c 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= xdm PORTVERSION= 1.1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdm/files/xdm.in b/x11/xdm/files/xdm.in index dae4a2a40039..4f46257a5da4 100644 --- a/x11/xdm/files/xdm.in +++ b/x11/xdm/files/xdm.in @@ -38,7 +38,11 @@ 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 %%LOCALBASE%%/bin/X :0 $vtarg\"" + xserver_args=$(grep '^:0' %%LOCALBASE%%/etc/X11/xdm/Xservers) + if [ $? -ne 0 ]; then + xserver_args=":0 local %%LOCALBASE%%/bin/X :0" + fi + command_args="-server \"$xserver_args $vtarg\"" } run_rc_command $1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310110527.39B5RmPH086434>