chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: Don't hold pointers to journal while remapping
[elogind.git]
/
src
/
login
/
multi-seat-x.c
diff --git
a/src/login/multi-seat-x.c
b/src/login/multi-seat-x.c
index 8f3aacdd3a07447e7ad5ccb9576d8b4aae8b54b9..7133e026dc2df356c32bf63faefbeca4c26c3ae9 100644
(file)
--- a/
src/login/multi-seat-x.c
+++ b/
src/login/multi-seat-x.c
@@
-46,6
+46,9
@@
int main(int argc, char *argv[]) {
* device assigned to a seat and write a configuration file
* from it and then spawn the real X server. */
* device assigned to a seat and write a configuration file
* from it and then spawn the real X server. */
+ /* 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];
for (i = 1; i < argc; i++)
if (streq(argv[i], "-seat"))
seat = argv[i+1];
@@
-89,7
+92,7
@@
int main(int argc, char *argv[]) {
dn = udev_device_get_devnode(d);
dn = udev_device_get_devnode(d);
- if (
!
dn) {
+ if (dn) {
device_node = strdup(dn);
if (!device_node) {
udev_device_unref(d);
device_node = strdup(dn);
if (!device_node) {
udev_device_unref(d);
@@
-136,6
+139,11
@@
int main(int argc, char *argv[]) {
"Section \"ServerFlags\"\n"
" Option \"AutoAddDevices\" \"True\"\n"
" Option \"AllowEmptyInput\" \"True\"\n"
"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",
device_node);
"EndSection\n",
device_node);