From d190145b94d00efe8a52c01c1675c308baa335cc Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 9 Jun 2022 11:21:17 +0200 Subject: stop unsetting DBUS_SESSION_BUS_ADDRESS variable It's not necessary as we no longer support running startx from an existing X session. Fixes #9. Signed-off-by: Dominik Mierzejewski --- startx.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/startx.cpp b/startx.cpp index d7daea4..7ed38db 100644 --- a/startx.cpp +++ b/startx.cpp @@ -11,7 +11,6 @@ XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM -unset DBUS_SESSION_BUS_ADDRESS unset SESSION_MANAGER #ifdef __APPLE__ -- cgit v1.2.3 From 60389ce90f552d9dfef8facf0efaf48efa59d93c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 28 Jul 2022 17:30:21 -0700 Subject: gitlab CI: stop requiring Signed-off-by in commits Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 469ba82..13bd884 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,14 +35,14 @@ variables: # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected # check-commits: extends: - .fdo.ci-fairy stage: prep script: - - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + - ci-fairy check-commits --junit-xml=results.xml except: - master@xorg/app/xinit variables: -- cgit v1.2.3 From 0ea1ec1ed445235cdba9e54e71023d5a82feed6b Mon Sep 17 00:00:00 2001 From: Arthur Williams Date: Fri, 14 Oct 2022 20:59:54 -0700 Subject: Don't wait for X to finish starting if it has died On my setup, when X first starts there aren't any screens available so it immediately dies. Half a second later, screens become available but xinit would still be waiting for the dead X process to signal that it is ready. It'll take 15s for it to timeout and respawn X. This patch makes xinit listen for its child's death and if X dies, it'll immediately stop waiting for it to finish starting and attempt to start it again. --- xinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinit.c b/xinit.c index 06c92b2..19022c1 100644 --- a/xinit.c +++ b/xinit.c @@ -263,7 +263,6 @@ main(int argc, char *argv[]) /* * Start the server and client. */ - signal(SIGCHLD, SIG_DFL); /* Insurance */ /* Let those signal interrupt the wait() call in the main loop */ memset(&sa, 0, sizeof sa); @@ -284,6 +283,7 @@ main(int argc, char *argv[]) sigaction(SIGALRM, &si, NULL); sigaction(SIGUSR1, &si, NULL); + sigaction(SIGCHLD, &si, NULL); #ifdef __APPLE__ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 -- cgit v1.2.3 From 4e66c0bf2b5751e113ad3aba79891608f7e883e2 Mon Sep 17 00:00:00 2001 From: Tim Egenton Date: Tue, 7 Dec 2021 09:15:18 -0500 Subject: startx: Source XINITRC and XSERVERRC variables Fix issue #14 Check XINITRC and XSERVERRC, if those files do not exist then just use ~/.xinitrc and ~/.xserverc as normal. Signed-off-by: Tim Egenton --- man/startx.man | 24 ++++++++++++++++++++++-- startx.cpp | 13 ++++++++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/man/startx.man b/man/startx.man index 2b894f7..2fe952d 100644 --- a/man/startx.man +++ b/man/startx.man @@ -71,7 +71,10 @@ startx \-\^\- \-layout Multihead .PP To determine the client to run, .B startx -first looks for a file called +first checks the environment variable +.I XINITRC +for a filename. If that variable is unset, or does not contain a filename, +it looks for a file called .I .xinitrc in the user's home directory. If that is not found, it uses the file @@ -85,7 +88,10 @@ behavior and revert to the behavior. To determine the server to run, .B startx -first looks for a file called +checks the environment variable +.I XSERVERRC +for a filename. If that variable is unset, or does not contain a filename, +it looks for a file called .I .xserverrc in the user's home directory. If that is not found, it uses the file @@ -161,6 +167,20 @@ for the local host. See the and .IR Xsecurity (__miscmansuffix__) manual pages for more information on X client/server authentication. +.TP 25 +XINITRC +This variable should contain the location of an xinitrc file. If unset, +.I $(HOME)/.xinitrc +or +.I __xinitdir__/xinitrc +will be used. +.TP 25 +XSERVERRC +This variable should contain the location of an xserver file. If unset, +.I $(HOME)/.xinitrc +or +.I __xinitdir__/xserverrc +will be used. .SH FILES .TP 25 .I $(HOME)/.xinitrc diff --git a/startx.cpp b/startx.cpp index 7ed38db..dfbebe1 100644 --- a/startx.cpp +++ b/startx.cpp @@ -2,11 +2,12 @@ XCOMM!SHELL_CMD XCOMM XCOMM This is just a sample implementation of a slightly less primitive -XCOMM interface than xinit. It looks for user .xinitrc and .xserverrc -XCOMM files, then system xinitrc and xserverrc files, else lets xinit choose -XCOMM its default. The system xinitrc should probably do things like check -XCOMM for .Xresources files and merge them in, start up a window manager, -XCOMM and pop a clock and several xterms. +XCOMM interface than xinit. It looks for XINITRC and XSERVERRC environment +XCOMM variables, then user .xinitrc and .xserverrc files, and then system +XCOMM xinitrc and xserverrc files, else lets xinit choose its default. +XCOMM The system xinitrc should probably do things like check for +XCOMM .Xresources files and merge them in, start up a window manager, and +XCOMM pop a clock and several xterms. XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM @@ -47,9 +48,11 @@ export PATH #endif userclientrc=$HOME/.xinitrc +[ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc userserverrc=$HOME/.xserverrc +[ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" sysserverrc=XINITDIR/xserverrc defaultclient=XTERM defaultserver=XSERVER -- cgit v1.2.3 From 4f22f255e58fda758fcdd85f8554c4ef274600e8 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 9 Nov 2022 12:22:19 -0800 Subject: man page: Update remote display example from rsh to ssh Signed-off-by: Alan Coopersmith --- man/xinit.man | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/xinit.man b/man/xinit.man index d9d08df..d51fecf 100644 --- a/man/xinit.man +++ b/man/xinit.man @@ -120,7 +120,7 @@ arguments to the default \fIxterm\fP command. It will ignore \fI\.xinitrc\fP. This will use the command \fI\./Xorg \-l \-c\fP to start the server and will append the arguments \fI\-e widgets\fP to the default \fIxterm\fP command. .TP 8 -.B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\- :1 \-a 2 \-t 5" +.B "xinit /usr/bin/ssh \-X fasthost cpupig \-\^\- :1 \-a 2 \-t 5" This will start a server named \fIX\fP on display 1 with the arguments \fI\-a 2 \-t 5\fP. It will then start a remote shell on the machine \fBfasthost\fP in which it will run the command \fIcpupig\fP, telling it -- cgit v1.2.3 From f9786fb5a7e526035699f3d4d6661468ab20e689 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 3 Dec 2022 14:05:44 -0800 Subject: xinit 1.4.2 Signed-off-by: Alan Coopersmith --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f67ee66..a40ac46 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.4.1], - [https://gitlab.freedesktop.org/xorg/app/xinit/issues], [xinit]) +AC_INIT([xinit], [1.4.2], + [https://gitlab.freedesktop.org/xorg/app/xinit/-/issues], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) -- cgit v1.2.3