From bf1d55c1aeef4d4755e1dbaf05cd625e48780bfb Mon Sep 17 00:00:00 2001 From: nia Date: Thu, 7 Apr 2022 22:33:28 +0200 Subject: startx: don't attempt to catch SIGKILL Most shells ignore attempts to catch SIGKILL. Some, such as NetBSD's /bin/sh, print an annoying message helpfully reminding you that it isn't possible to catch SIGKILL whenever X starts. Signed-off-by: Nia Alarie --- startx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startx.cpp b/startx.cpp index 31187b9..6502dbf 100644 --- a/startx.cpp +++ b/startx.cpp @@ -271,7 +271,7 @@ if [ x"$enable_xauth" = x1 ] ; then XCOMM create a file with auth information for the server. ':0' is a dummy. xserverauthfile=$HOME/.serverauth.$$ - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie EOF -- cgit v1.2.3 From 6bdce31401e3caf10242f1e8a4855b2c8e90ea13 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sun, 19 Jun 2022 20:09:55 -0700 Subject: darwin: Wait for font_cache to complete to avoid a race with `xset fb=` Partially fixes: https://github.com/XQuartz/XQuartz/issues/216 Signed-off-by: Jeremy Huddleston Sequoia --- launchd/privileged_startx/20-font_cache.cpp | 6 +++--- startx.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/launchd/privileged_startx/20-font_cache.cpp b/launchd/privileged_startx/20-font_cache.cpp index 6d43e10..1048b15 100755 --- a/launchd/privileged_startx/20-font_cache.cpp +++ b/launchd/privileged_startx/20-font_cache.cpp @@ -27,9 +27,9 @@ XCOMM promote the sale, use or other dealings in this Software without XCOMM prior written authorization. if [ -x BINDIR/font_cache ] ; then - BINDIR/font_cache -s & + BINDIR/font_cache -s elif [ -x BINDIR/font_cache.sh ] ; then - BINDIR/font_cache.sh -s & + BINDIR/font_cache.sh -s elif [ -x BINDIR/fc-cache ] ; then - BINDIR/fc-cache & + BINDIR/fc-cache fi diff --git a/startx.cpp b/startx.cpp index 6502dbf..d7daea4 100644 --- a/startx.cpp +++ b/startx.cpp @@ -87,17 +87,17 @@ fi XCOMM First, start caching fonts if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then if [ -x $bindir/font_cache ] ; then - $bindir/font_cache & + $bindir/font_cache elif [ -x $bindir/font_cache.sh ] ; then - $bindir/font_cache.sh & + $bindir/font_cache.sh elif [ -x $bindir/fc-cache ] ; then - $bindir/fc-cache & + $bindir/fc-cache fi fi if [ -x __libexecdir__/privileged_startx ] ; then - # Don't push this into the background because it can cause - # a race to create /tmp/.X11-unix + XCOMM Don't push this into the background because it can cause + XCOMM a race to create /tmp/.X11-unix __libexecdir__/privileged_startx fi -- cgit v1.2.3