diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2015-10-11 03:55:41 +0000 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2015-10-14 15:05:04 +0000 |
| commit | 460ed929cf2081e5a445b9e8fedbbaf0da7eff44 (patch) | |
| tree | 3b59f7a69d12140e4bf6386f140d36be4f179f3d | |
| parent | 7135129e0aa24f6e4c36d78ccf782761c9780cad (diff) | |
systemd-run: can launch units with SyslogFacility
| -rw-r--r-- | src/core/dbus-execute.c | 13 | ||||
| -rw-r--r-- | src/shared/bus-util.c | 11 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 73290002f6..b87192a9ae 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -894,6 +894,19 @@ int bus_exec_context_set_transient_property( } return 1; + } else if (streq(name, "SyslogFacility")) { + int facility; + + r = sd_bus_message_read(message, "i", &facility); + if (r < 0) + return r; + + if (mode != UNIT_CHECK) { + c->syslog_priority = (facility << 3) | LOG_PRI(c->syslog_priority); + unit_write_drop_in_private_format(u, mode, name, "SyslogFacility=%i\n", facility); + } + + return 1; } else if (streq(name, "Nice")) { int n; diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index bf9320b0e0..3a45ac4064 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1508,6 +1508,17 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen r = sd_bus_message_append(m, "v", "i", level); + } else if (streq(field, "SyslogFacility")) { + int facility; + + facility = log_facility_unshifted_from_string(eq); + if (facility < 0) { + log_error("Failed to parse %s value %s.", field, eq); + return -EINVAL; + } + + r = sd_bus_message_append(m, "v", "i", facility); + } else if (streq(field, "DeviceAllow")) { if (isempty(eq)) |