diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-10-05 09:49:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-05 09:49:36 -0500 |
commit | b8318e2e5a49228c6642de3c4e65b5d1620ea561 (patch) | |
tree | c04707187bb0b34bc363435b6739fe8f050793d0 /pkgs/os-specific/linux/systemd | |
parent | 2d92e695ba2856e62b61937352e86492ed22786e (diff) | |
parent | 4e384ddc113f25aa00f96c96368cb8382981ddc7 (diff) | |
download | nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.tar nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.tar.gz nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.tar.bz2 nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.tar.lz nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.tar.xz nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.tar.zst nixpkgs-b8318e2e5a49228c6642de3c4e65b5d1620ea561.zip |
Merge pull request #99621 from ttuegel/staging--plasma-switch-user
systemd: show CanMultiSession again
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch | 13 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch b/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch new file mode 100644 index 00000000000..6ed82a42e70 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch @@ -0,0 +1,13 @@ +diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c +index a91765205c..742aeb1064 100644 +--- a/src/login/logind-seat-dbus.c ++++ b/src/login/logind-seat-dbus.c +@@ -451,7 +451,7 @@ static const sd_bus_vtable seat_vtable[] = { + + SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), +- SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN), ++ SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("CanTTY", "b", property_get_can_tty, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0), diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bf789970c12..cef9d96ae6e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -54,6 +54,7 @@ in stdenv.mkDerivation { ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0019-revert-get-rid-of-seat_can_multi_session.patch ]; postPatch = '' |