Lennart, I've told you some time ago that Xorg-server since release 1.16 no longer requires multi-seat-x wrapper. Em 27/10/2014 11:00, "Lennart Poettering" <lenn...@poettering.net> escreveu:
> On Sun, 26.10.14 00:30, Timofey Titovets (nefelim...@gmail.com) wrote: > > > Completed TODO: remove multi-seat-x > > Hmm, I don't remember the details of this, did X release a new version > which makes this tool unnecessary? I think they commited code that > made it unnecessary, but did they actually release it? > > > > > From 57b2655d2041d2bb2e9b25bef577ead9b27ce6ee Mon Sep 17 00:00:00 2001 > > From: Timofey Titovets <nefelim...@gmail.com> > > Date: Sun, 26 Oct 2014 00:17:24 +0300 > > Subject: [PATCH] login: remove multi-seat-x > > > > --- > > Makefile.am | 14 ------ > > TODO | 2 - > > configure.ac | 8 ---- > > src/login/multi-seat-x.c | 108 > > ----------------------------------------------- > > 4 files changed, 132 deletions(-) > > delete mode 100644 src/login/multi-seat-x.c > > > > diff --git a/Makefile.am b/Makefile.am > > index fae946a..fc86b45 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -5400,20 +5400,6 @@ SYSTEM_UNIT_ALIASES += \ > > BUSNAMES_TARGET_WANTS += \ > > org.freedesktop.login1.busname > > > > -if ENABLE_MULTI_SEAT_X > > - > > -systemd_multi_seat_x_SOURCES = \ > > - src/login/multi-seat-x.c > > - > > -systemd_multi_seat_x_LDADD = \ > > - libsystemd-label.la \ > > - libsystemd-shared.la > > - > > -rootlibexec_PROGRAMS += \ > > - systemd-multi-seat-x > > - > > -endif > > - > > dist_udevrules_DATA += \ > > src/login/70-uaccess.rules \ > > src/login/70-power-switch.rules > > diff --git a/TODO b/TODO > > index ed00661..195ca55 100644 > > --- a/TODO > > +++ b/TODO > > @@ -102,8 +102,6 @@ Features: > > > > * maybe introduce AssertXYZ= similar to ConditionXYZ= that causes a > unit to > > fail (instead of skipping it) if some condition is not true... > > > > -* remove multi-seat-x now > > - > > * refcounting in sd-resolve is borked > > > > * exponential backoff in timesyncd and resolved when we cannot reach a > > server > > diff --git a/configure.ac b/configure.ac > > index c3b4ea3..f69eb82 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -1063,14 +1063,6 @@ fi > > AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) > > > > # > ------------------------------------------------------------------------------ > > -have_multi_seat_x=no > > -AC_ARG_ENABLE(multi_seat_x, AS_HELP_STRING([--disable-multi-seat-x], [do > > not build multi-seat-x])) > > -if test "x$enable_multi_seat_x" != "xno"; then > > - have_multi_seat_x=yes > > -fi > > -AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"]) > > - > > -# > ------------------------------------------------------------------------------ > > have_terminal=no > > AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable > > terminal support])) > > if test "x$enable_terminal" = "xyes"; then > > diff --git a/src/login/multi-seat-x.c b/src/login/multi-seat-x.c > > deleted file mode 100644 > > index 83760d4..0000000 > > --- a/src/login/multi-seat-x.c > > +++ /dev/null > > @@ -1,108 +0,0 @@ > > -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ > > - > > -/*** > > - This file is part of systemd. > > - > > - Copyright 2011 Lennart Poettering > > - > > - systemd is free software; you can redistribute it and/or modify it > > - under the terms of the GNU Lesser General Public License as published > by > > - the Free Software Foundation; either version 2.1 of the License, or > > - (at your option) any later version. > > - > > - systemd is distributed in the hope that it will be useful, but > > - WITHOUT ANY WARRANTY; without even the implied warranty of > > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > License > > - along with systemd; If not, see <http://www.gnu.org/licenses/>. > > -***/ > > - > > -#include <string.h> > > -#include <unistd.h> > > - > > -#include "util.h" > > -#include "mkdir.h" > > - > > -int main(int argc, char *argv[]) { > > - > > - int i; > > - const char *seat = NULL; > > - char **new_argv; > > - _cleanup_free_ char *path = NULL; > > - int r; > > - _cleanup_fclose_ FILE *f = NULL; > > - > > - /* This binary will go away as soon as X natively takes the > > - * arguments in question as command line parameters, instead > > - * of requiring them in the configuration file. */ > > - > > - /* If this file is removed, don't forget to remove the code > > - * that invokes this in gdm and other display managers. */ > > - > > - for (i = 1; i < argc; i++) > > - if (streq(argv[i], "-seat")) > > - seat = argv[i+1]; > > - > > - if (isempty(seat) || streq(seat, "seat0")) { > > - argv[0] = (char*) X_SERVER; > > - execv(X_SERVER, argv); > > - log_error("Failed to execute real X server: %m"); > > - goto fail; > > - } > > - > > - r = mkdir_safe_label("/run/systemd/multi-session-x", 0755, 0, > 0); > > - if (r < 0) { > > - log_error("Failed to create directory: %s", > strerror(-r)); > > - goto fail; > > - } > > - > > - path = strappend("/run/systemd/multi-session-x/", seat); > > - if (!path) { > > - log_oom(); > > - goto fail; > > - } > > - > > - f = fopen(path, "we"); > > - if (!f) { > > - log_error("Failed to write configuration file: %m"); > > - goto fail; > > - } > > - > > - fprintf(f, > > - "Section \"ServerFlags\"\n" > > - " Option \"AutoAddDevices\" \"True\"\n" > > - " Option \"AllowEmptyInput\" \"True\"\n" > > - " Option \"DontVTSwitch\" \"True\"\n" > > - "EndSection\n" > > - "Section \"InputClass\"\n" > > - " Identifier \"Force Input Devices to Seat\"\n" > > - " Option \"GrabDevice\" \"True\"\n" > > - "EndSection\n"); > > - > > - fflush(f); > > - > > - if (ferror(f)) { > > - log_error("Failed to write configuration file: %m"); > > - goto fail; > > - } > > - > > - fclose(f); > > - f = NULL; > > - > > - new_argv = newa(char*, argc + 3 + 1); > > - memcpy(new_argv, argv, sizeof(char*) * (argc + 2 + 1)); > > - > > - new_argv[0] = (char*) X_SERVER; > > - new_argv[argc+0] = (char*) "-config"; > > - new_argv[argc+1] = path; > > - new_argv[argc+2] = (char*) "-sharevts"; > > - new_argv[argc+3] = NULL; > > - > > - execv(X_SERVER, new_argv); > > - log_error("Failed to execute real X server: %m"); > > - > > -fail: > > - return EXIT_FAILURE; > > -} > > -- > > 2.1.2 > > > > > > > >From 57b2655d2041d2bb2e9b25bef577ead9b27ce6ee Mon Sep 17 00:00:00 2001 > > From: Timofey Titovets <nefelim...@gmail.com> > > Date: Sun, 26 Oct 2014 00:17:24 +0300 > > Subject: [PATCH] login: remove multi-seat-x > > > > --- > > Makefile.am | 14 ------ > > TODO | 2 - > > configure.ac | 8 ---- > > src/login/multi-seat-x.c | 108 > ----------------------------------------------- > > 4 files changed, 132 deletions(-) > > delete mode 100644 src/login/multi-seat-x.c > > > > diff --git a/Makefile.am b/Makefile.am > > index fae946a..fc86b45 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -5400,20 +5400,6 @@ SYSTEM_UNIT_ALIASES += \ > > BUSNAMES_TARGET_WANTS += \ > > org.freedesktop.login1.busname > > > > -if ENABLE_MULTI_SEAT_X > > - > > -systemd_multi_seat_x_SOURCES = \ > > - src/login/multi-seat-x.c > > - > > -systemd_multi_seat_x_LDADD = \ > > - libsystemd-label.la \ > > - libsystemd-shared.la > > - > > -rootlibexec_PROGRAMS += \ > > - systemd-multi-seat-x > > - > > -endif > > - > > dist_udevrules_DATA += \ > > src/login/70-uaccess.rules \ > > src/login/70-power-switch.rules > > diff --git a/TODO b/TODO > > index ed00661..195ca55 100644 > > --- a/TODO > > +++ b/TODO > > @@ -102,8 +102,6 @@ Features: > > > > * maybe introduce AssertXYZ= similar to ConditionXYZ= that causes a > unit to fail (instead of skipping it) if some condition is not true... > > > > -* remove multi-seat-x now > > - > > * refcounting in sd-resolve is borked > > > > * exponential backoff in timesyncd and resolved when we cannot reach a > server > > diff --git a/configure.ac b/configure.ac > > index c3b4ea3..f69eb82 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -1063,14 +1063,6 @@ fi > > AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) > > > > # > ------------------------------------------------------------------------------ > > -have_multi_seat_x=no > > -AC_ARG_ENABLE(multi_seat_x, AS_HELP_STRING([--disable-multi-seat-x], > [do not build multi-seat-x])) > > -if test "x$enable_multi_seat_x" != "xno"; then > > - have_multi_seat_x=yes > > -fi > > -AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"]) > > - > > -# > ------------------------------------------------------------------------------ > > have_terminal=no > > AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable > terminal support])) > > if test "x$enable_terminal" = "xyes"; then > > diff --git a/src/login/multi-seat-x.c b/src/login/multi-seat-x.c > > deleted file mode 100644 > > index 83760d4..0000000 > > --- a/src/login/multi-seat-x.c > > +++ /dev/null > > @@ -1,108 +0,0 @@ > > -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ > > - > > -/*** > > - This file is part of systemd. > > - > > - Copyright 2011 Lennart Poettering > > - > > - systemd is free software; you can redistribute it and/or modify it > > - under the terms of the GNU Lesser General Public License as published > by > > - the Free Software Foundation; either version 2.1 of the License, or > > - (at your option) any later version. > > - > > - systemd is distributed in the hope that it will be useful, but > > - WITHOUT ANY WARRANTY; without even the implied warranty of > > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > - Lesser General Public License for more details. > > - > > - You should have received a copy of the GNU Lesser General Public > License > > - along with systemd; If not, see <http://www.gnu.org/licenses/>. > > -***/ > > - > > -#include <string.h> > > -#include <unistd.h> > > - > > -#include "util.h" > > -#include "mkdir.h" > > - > > -int main(int argc, char *argv[]) { > > - > > - int i; > > - const char *seat = NULL; > > - char **new_argv; > > - _cleanup_free_ char *path = NULL; > > - int r; > > - _cleanup_fclose_ FILE *f = NULL; > > - > > - /* This binary will go away as soon as X natively takes the > > - * arguments in question as command line parameters, instead > > - * of requiring them in the configuration file. */ > > - > > - /* If this file is removed, don't forget to remove the code > > - * that invokes this in gdm and other display managers. */ > > - > > - for (i = 1; i < argc; i++) > > - if (streq(argv[i], "-seat")) > > - seat = argv[i+1]; > > - > > - if (isempty(seat) || streq(seat, "seat0")) { > > - argv[0] = (char*) X_SERVER; > > - execv(X_SERVER, argv); > > - log_error("Failed to execute real X server: %m"); > > - goto fail; > > - } > > - > > - r = mkdir_safe_label("/run/systemd/multi-session-x", 0755, 0, > 0); > > - if (r < 0) { > > - log_error("Failed to create directory: %s", > strerror(-r)); > > - goto fail; > > - } > > - > > - path = strappend("/run/systemd/multi-session-x/", seat); > > - if (!path) { > > - log_oom(); > > - goto fail; > > - } > > - > > - f = fopen(path, "we"); > > - if (!f) { > > - log_error("Failed to write configuration file: %m"); > > - goto fail; > > - } > > - > > - fprintf(f, > > - "Section \"ServerFlags\"\n" > > - " Option \"AutoAddDevices\" \"True\"\n" > > - " Option \"AllowEmptyInput\" \"True\"\n" > > - " Option \"DontVTSwitch\" \"True\"\n" > > - "EndSection\n" > > - "Section \"InputClass\"\n" > > - " Identifier \"Force Input Devices to Seat\"\n" > > - " Option \"GrabDevice\" \"True\"\n" > > - "EndSection\n"); > > - > > - fflush(f); > > - > > - if (ferror(f)) { > > - log_error("Failed to write configuration file: %m"); > > - goto fail; > > - } > > - > > - fclose(f); > > - f = NULL; > > - > > - new_argv = newa(char*, argc + 3 + 1); > > - memcpy(new_argv, argv, sizeof(char*) * (argc + 2 + 1)); > > - > > - new_argv[0] = (char*) X_SERVER; > > - new_argv[argc+0] = (char*) "-config"; > > - new_argv[argc+1] = path; > > - new_argv[argc+2] = (char*) "-sharevts"; > > - new_argv[argc+3] = NULL; > > - > > - execv(X_SERVER, new_argv); > > - log_error("Failed to execute real X server: %m"); > > - > > -fail: > > - return EXIT_FAILURE; > > -} > > -- > > 2.1.2 > > > > > _______________________________________________ > > systemd-devel mailing list > > systemd-devel@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/systemd-devel > > > > Lennart > > -- > Lennart Poettering, Red Hat > _______________________________________________ > systemd-devel mailing list > systemd-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/systemd-devel >
_______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
