From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sun, 11 Oct 2015 03:55:41 +0000 (+0000)
Subject: systemd-run: can launch units with SyslogFacility
X-Git-Tag: v228~203^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=460ed929cf2081e5a445b9e8fedbbaf0da7eff44;p=thirdparty%2Fsystemd.git

systemd-run: can launch units with SyslogFacility
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 73290002f6f..b87192a9aeb 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -893,6 +893,19 @@ int bus_exec_context_set_transient_property(
                         unit_write_drop_in_private_format(u, mode, name, "SyslogLevel=%i\n", level);
                 }
 
+                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 bf9320b0e0f..3a45ac40642 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))