diff options
author | Franck Bui <fbui@suse.com> | 2017-04-26 14:20:41 +0200 |
---|---|---|
committer | Franck Bui <fbui@suse.com> | 2017-06-08 16:21:36 +0200 |
commit | dc6284e9efb0a6801dd7a951d39ebb7d9a279676 (patch) | |
tree | 9a0889495859a3f3433083872a54fddcd7495162 /src/login/logind-session-dbus.c | |
parent | 4c47affcf1e501431f3cb567c516ec252dfc4bbc (diff) | |
download | systemd-dc6284e9efb0a6801dd7a951d39ebb7d9a279676.tar.gz |
logind: when setting a new controller, don't prepare the VT if logind is restarted
When assigning a new session controller to a session, the VT is prepared so the
controller can expect the VT to be in a good default state.
However when logind is restarted and a session controller already took control
of a session, there's no need to prepare th VT otherwise logind may screw up
the VT state set by the controller.
This patch prevents the preparation of the VT in this case.
Diffstat (limited to 'src/login/logind-session-dbus.c')
-rw-r--r-- | src/login/logind-session-dbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index 22dea5db1f..412efcd958 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -396,7 +396,7 @@ static int method_take_control(sd_bus_message *message, void *userdata, sd_bus_e if (uid != 0 && (force || uid != s->user->uid)) return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may take control"); - r = session_set_controller(s, sd_bus_message_get_sender(message), force); + r = session_set_controller(s, sd_bus_message_get_sender(message), force, true); if (r < 0) return r; |