Package: rootskel-gtk Version: 1.18 Tags: patch Subject: Only start X if we're using the GTK frontend. Also try to not start X clients before the server is ready to accept connections. --- As discussed in #574288 we shouldn't start X for other debconf frontends. Re: starting multiple servers, I don't think the risk exists because if the server is already running then trying to start it again will fail (either because /tmp/.X0-lock already exists, or because bind() fails with EADDRINUSE). And if it died, then this should be able to restart it (untested, though). debian/changelog | 7 +++++++ src/lib/debian-installer.d/S62Xorg | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c47b5af..d214cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rootskel-gtk (1.19) UNRELEASED; urgency=low + + * Only start X if we're using the GTK frontend. Also try to not + start X clients before the server is ready to accept connections. + + -- Julien Cristau <jcristau@debian.org> Sun, 28 Mar 2010 23:46:02 +0200 + rootskel-gtk (1.18) unstable; urgency=low [ Julien Cristau / Frans Pop ] diff --git a/src/lib/debian-installer.d/S62Xorg b/src/lib/debian-installer.d/S62Xorg index cbc3384..7d74205 100644 --- a/src/lib/debian-installer.d/S62Xorg +++ b/src/lib/debian-installer.d/S62Xorg @@ -1,2 +1,6 @@ -Xorg -retro -noreset -nolisten tcp & -export DISPLAY=:0 +if [ "$DEBIAN_FRONTEND" = gtk ]; then + trap : SIGUSR1 + (trap '' SIGUSR1; exec Xorg -noreset -nolisten tcp) & + wait + export DISPLAY=:0 +fi -- 1.7.0.3
Attachment:
signature.asc
Description: Digital signature