chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: use IP address when hostname is not found
[elogind.git]
/
src
/
cgroups-agent
/
cgroups-agent.c
diff --git
a/src/cgroups-agent/cgroups-agent.c
b/src/cgroups-agent/cgroups-agent.c
index 256de1f506c814f6354b03e9bcfe602ff76c4648..e581fbc9b6afb64cd2cf6c4fc2a103369b6cfa1e 100644
(file)
--- a/
src/cgroups-agent/cgroups-agent.c
+++ b/
src/cgroups-agent/cgroups-agent.c
@@
-22,12
+22,11
@@
#include <stdlib.h>
#include "sd-bus.h"
#include <stdlib.h>
#include "sd-bus.h"
-
#include "log.h"
#include "bus-util.h"
int main(int argc, char *argv[]) {
#include "log.h"
#include "bus-util.h"
int main(int argc, char *argv[]) {
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_
close_
unref_ sd_bus *bus = NULL;
int r;
if (argc != 2) {
int r;
if (argc != 2) {
@@
-44,9
+43,12
@@
int main(int argc, char *argv[]) {
* this to avoid an activation loop when we start dbus when we
* are called when the dbus service is shut down. */
* this to avoid an activation loop when we start dbus when we
* are called when the dbus service is shut down. */
- r = bus_
connect_system
(&bus);
+ r = bus_
open_system_systemd
(&bus);
if (r < 0) {
if (r < 0) {
- log_warning("Failed to get D-Bus connection: %s", strerror(-r));
+ /* If we couldn't connect we assume this was triggered
+ * while systemd got restarted/transitioned from
+ * initrd to the system, so let's ignore this */
+ log_debug("Failed to get D-Bus connection: %s", strerror(-r));
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-56,11
+58,9
@@
int main(int argc, char *argv[]) {
"Released",
"s", argv[1]);
if (r < 0) {
"Released",
"s", argv[1]);
if (r < 0) {
- log_
error
("Failed to send signal message on private connection: %s", strerror(-r));
+ log_
debug
("Failed to send signal message on private connection: %s", strerror(-r));
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- sd_bus_flush(bus);
-
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}