shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

systemctl: prefer shutting down through logind even as root

Browse Source 
Otherwise, wall messages will not be generated for root.
This commit is contained in:
Lennart Poettering 2015-09-29 14:00:21 +02:00
parent 57ab90065d
commit 7089051f67
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/systemctl/systemctl.c
View File

@ -3136,9 +3136,8 @@ static int start_special(char **args) {
ACTION_EXIT)) ACTION_EXIT))
return daemon_reload(args); return daemon_reload(args);
/* first try logind, to allow authentication with polkit */ /* First try logind, to allow authentication with polkit */
if (geteuid() != 0 && if (IN_SET(a,
IN_SET(a,
ACTION_POWEROFF, ACTION_POWEROFF,
ACTION_REBOOT, ACTION_REBOOT,
ACTION_SUSPEND, ACTION_SUSPEND,
@ -3150,7 +3149,8 @@ static int start_special(char **args) {
if (IN_SET(r, -EOPNOTSUPP, -EINPROGRESS)) if (IN_SET(r, -EOPNOTSUPP, -EINPROGRESS))
/* requested operation is not supported or already in progress */ /* requested operation is not supported or already in progress */
return r; return r;
/* on all other errors, try low-level operation */
/* On all other errors, try low-level operation */
} }
return start_unit(args); return start_unit(args);