chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: use a private notify sockets in containers to avoid problems with shared...
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 2007ec79e4b35a8ff12d1879bef8c5127ed313dc..96b7c6cd7eb8dd16a8b01219a7df1c0be18b6de5 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-84,7
+84,7
@@
int inhibitor_save(Inhibitor *i) {
assert(i);
assert(i);
- r =
safe_mkdir
("/run/systemd/inhibit", 0755, 0, 0);
+ r =
mkdir_safe_label
("/run/systemd/inhibit", 0755, 0, 0);
if (r < 0)
goto finish;
if (r < 0)
goto finish;
@@
-163,7
+163,7
@@
int inhibitor_start(Inhibitor *i) {
i->started = true;
i->started = true;
- manager_send_changed(i->manager,
"
Inhibited\0");
+ manager_send_changed(i->manager,
i->mode == INHIBIT_BLOCK ? "BlockInhibited\0" : "Delay
Inhibited\0");
return 0;
}
return 0;
}
@@
-182,7
+182,7
@@
int inhibitor_stop(Inhibitor *i) {
i->started = false;
i->started = false;
- manager_send_changed(i->manager,
"
Inhibited\0");
+ manager_send_changed(i->manager,
i->mode == INHIBIT_BLOCK ? "BlockInhibited\0" : "Delay
Inhibited\0");
return 0;
}
return 0;
}
@@
-272,7
+272,7
@@
int inhibitor_create_fifo(Inhibitor *i) {
/* Create FIFO */
if (!i->fifo_path) {
/* Create FIFO */
if (!i->fifo_path) {
- r =
safe_mkdir
("/run/systemd/inhibit", 0755, 0, 0);
+ r =
mkdir_safe_label
("/run/systemd/inhibit", 0755, 0, 0);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-297,7
+297,7
@@
int inhibitor_create_fifo(Inhibitor *i) {
zero(ev);
ev.events = 0;
zero(ev);
ev.events = 0;
- ev.data.u32 = FD_
FIFO
_BASE + i->fifo_fd;
+ ev.data.u32 = FD_
OTHER
_BASE + i->fifo_fd;
if (epoll_ctl(i->manager->epoll_fd, EPOLL_CTL_ADD, i->fifo_fd, &ev) < 0)
return -errno;
if (epoll_ctl(i->manager->epoll_fd, EPOLL_CTL_ADD, i->fifo_fd, &ev) < 0)
return -errno;