mirror of
https://github.com/systemd/systemd
synced 2024-10-15 04:24:19 +00:00
login: remove multi-seat-x
This commit is contained in:
parent
ca4a7a9a36
commit
3769415e65
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -93,7 +93,6 @@
|
||||||
/systemd-machined
|
/systemd-machined
|
||||||
/systemd-modeset
|
/systemd-modeset
|
||||||
/systemd-modules-load
|
/systemd-modules-load
|
||||||
/systemd-multi-seat-x
|
|
||||||
/systemd-networkd
|
/systemd-networkd
|
||||||
/systemd-networkd-wait-online
|
/systemd-networkd-wait-online
|
||||||
/systemd-notify
|
/systemd-notify
|
||||||
|
|
14
Makefile.am
14
Makefile.am
|
@ -5400,20 +5400,6 @@ SYSTEM_UNIT_ALIASES += \
|
||||||
BUSNAMES_TARGET_WANTS += \
|
BUSNAMES_TARGET_WANTS += \
|
||||||
org.freedesktop.login1.busname
|
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 += \
|
dist_udevrules_DATA += \
|
||||||
src/login/70-uaccess.rules \
|
src/login/70-uaccess.rules \
|
||||||
src/login/70-power-switch.rules
|
src/login/70-power-switch.rules
|
||||||
|
|
6
NEWS
6
NEWS
|
@ -142,6 +142,12 @@ CHANGES WITH 217:
|
||||||
occur. Again: you need to update util-linux to at least
|
occur. Again: you need to update util-linux to at least
|
||||||
v2.25 when updating systemd to v217.
|
v2.25 when updating systemd to v217.
|
||||||
|
|
||||||
|
* The "multi-seat-x" tool has been removed from systemd, as
|
||||||
|
its functionality has been integrated into X servers 1.16,
|
||||||
|
and the tool is hence redundant. It is recommended to update
|
||||||
|
display managers invoking this tool to simply invoke X
|
||||||
|
directly from now on, again.
|
||||||
|
|
||||||
CHANGES WITH 216:
|
CHANGES WITH 216:
|
||||||
|
|
||||||
* timedated no longer reads NTP implementation unit names from
|
* timedated no longer reads NTP implementation unit names from
|
||||||
|
|
2
TODO
2
TODO
|
@ -98,8 +98,6 @@ Features:
|
||||||
|
|
||||||
* maybe introduce AssertXYZ= similar to ConditionXYZ= that causes a unit to fail (instead of skipping it) if some condition is not true...
|
* 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
|
* refcounting in sd-resolve is borked
|
||||||
|
|
||||||
* exponential backoff in timesyncd and resolved when we cannot reach a server
|
* exponential backoff in timesyncd and resolved when we cannot reach a server
|
||||||
|
|
|
@ -1062,14 +1062,6 @@ if test "x$enable_efi" != "xno"; then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"])
|
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
|
have_terminal=no
|
||||||
AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support]))
|
AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support]))
|
||||||
|
@ -1378,7 +1370,6 @@ AC_MSG_RESULT([
|
||||||
nss-myhostname: ${have_myhostname}
|
nss-myhostname: ${have_myhostname}
|
||||||
gudev: ${enable_gudev}
|
gudev: ${enable_gudev}
|
||||||
gintrospection: ${enable_introspection}
|
gintrospection: ${enable_introspection}
|
||||||
multi-seat-x: ${have_multi_seat_x}
|
|
||||||
terminal: ${have_terminal}
|
terminal: ${have_terminal}
|
||||||
kdbus: ${have_kdbus}
|
kdbus: ${have_kdbus}
|
||||||
Python: ${have_python}
|
Python: ${have_python}
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
Loading…
Reference in a new issue