Age | Commit message (Collapse) | Author |
|
Also fix same mistake in the startx manpage.
Signed-off-by: ayekat <takeya@bluewin.ch>
|
|
possible bashism in 10-tmpdirs line 57 (should be >word 2>&1):
if ${MKTEMP} -d ${dir} >& /dev/null ; then
Fixes: https://github.com/XQuartz/XQuartz/issues/316
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
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 <tegenton@splattim.me>
|
|
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.
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
It's not necessary as we no longer support running startx from an
existing X session.
Fixes #9.
Signed-off-by: Dominik Mierzejewski <dominik@greysector.net>
|
|
Partially fixes: https://github.com/XQuartz/XQuartz/issues/216
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
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 <nia@NetBSD.org>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
startx uses non-portable grep flags (-o). grep isn't even needed for
this and has been replaced with substring removal.
Closes #6
|
|
Fixes: https://github.com/XQuartz/XQuartz/issues/54
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
Fixes: https://github.com/XQuartz/XQuartz/issues/114
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
startx calls hostname to obtain the hostname, but this is not defined by POSIX, so not guaranteed to work. The script already does some checks to deal with different hostname implementations on Linux.
Using uname -n instead fixes this in a portable way.
|
|
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
It looks to me like commit 5268936259c5 (Remove SCO support for
SHELL_CMD and startx man page.) removed the wrong bits of the man page.
This commit replaces the SCO UNIX bits of the man page with the non-SCO
UNIX bits.
Signed-off-by: Matt Turner <mattst88@gmail.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Command line arguments are copied into clientargv and serverargv without
verifying that enough space is available. A high amount of arguments can
therefore trigger a buffer overflow like this:
$ xinit $(seq 1 500)
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Walter Harms wharms@bfs,de
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726962
https://bugs.freedesktop.org/show_bug.cgi?id=83797
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Make text about supplying X server arguments via startx more generic,
rather than assuming the started server will be Xorg, and hence will
take Xorg's arguments.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Even though this code is only active on __sun machines, the fork return
value should be checked for -1, not 1, to detect an error situation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
|
|
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Syncs the invocation of configure with the one from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=96260
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=95379
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
some X manuals use then escape sequence \/ when they want to render
a slash. That's bad because \/ is not a slash but an italic
correction, never producing any output, having no effect at all in
terminal output, and only changing spacing in a minor way in typeset
output.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
This is misleading - it is always overwritten after looping through the lock
files.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
|
Currently startx relies on /tmp/.X?-lock being present for automatically
picking a free display number. This does not work if -nolock is used when
starting the server, or if the server is started with -displayfd as -displayfd
implies -nolock.
This is becoming a problem now that -displayfd is getting used by
display-managers (e.g. gdm), this fixes this by also checking for
/tmp/.X11-unix/X?
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
This was left over when reorganizing layout of launchd sources
in commit 567f59d3f8189b92bc46e2af1260f9340f462bdb
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
This was Apple Computer’s implementation of the Unix operating system
for some of their Macintosh computers. From 1988 to 1995.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
SCO support was removed from startx.cpp and xinitrc.cpp earlier.
Remove unixware / sco support
http://cgit.freedesktop.org/xorg/app/xinit/commit/
?id=fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Use the ':' operator instead of "match" and avoid the use of "\+". Both
constructions aren't specified by POSIX and not supported in BSD expr.
Also drop the '^' from the regular expressions as it is implicit and
POSIX leaves its behaviour undefined.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
|
|
Detaching from the tty causes systemd-logind to refuse service to the xserver,
the xserver already tries to detect that it is being asked to run on the
current tty and then automatically enables -keeptty, but this code fails if
all of stdin, stdout and stderr are redirected to a file. So explicitly tell
the xserver to not detach when we're telling it to run on the current tty.
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Since xinit's autoconf script was changed to use AC_PATH_PROGS() to find
openssl this hardcoded path to openssl can be removed. This was noticed
recently when openssl was moved from /usr/sbin to /usr/bin and developers
were looking for anything having hardcoded paths.
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=83019
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
See http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Adding vtX to $defaultserverargs means that it will only be added when
the user specifies no server arguments.
This means that doing ie: "startx -- -depth 16" will cause the server to start
on a different vt then just "startx", which does not meat the principle of
least surprise.
Instead always pass the vtX argument, except when the user has specified its
own vtX argument. Note that vtX still only gets added for the default server,
since for ie Xnest or Xephyr it makes no sense.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
|
|
When we let X allocate a new VT, systemd-logind will not recognize any
processes running on this VT as belonging to a valid session (since there
was no pam session opened on that tty).
This causes problems like PolicyKit denials for these processes.
ConsoleKit under Linux has been deprecated for a few years now and is no
longer being maintained, so simply make this the default under Linux.
Note we do not pass in the vt if the user has specified an alternative server
to start, as the vtX argument is only valid for the Xorg server, likewise we
omit it if the user has specified any other server arguments.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=806491
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__
these have been broken (all #ifdef-s always seen as false) since:
http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258
This commit makes these work again by removing -undef from the cpp flags.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|