From a1104deef02699082f6b61008edd6ecf3033ed25 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 25 Aug 2015 18:37:16 +0200
Subject: machine: policykit string fixes

---
 src/machine/org.freedesktop.machine1.policy.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/machine/org.freedesktop.machine1.policy.in
index 6e35c5c045..69f78a5c25 100644
--- a/src/machine/org.freedesktop.machine1.policy.in
+++ b/src/machine/org.freedesktop.machine1.policy.in
@@ -60,7 +60,7 @@
 
         <action id="org.freedesktop.machine1.open-pty">
                 <_description>Acquire a pseudo TTY in a local container</_description>
-                <_message>Authentication is acquire a pseudo TTY in a local container.</_message>
+                <_message>Authentication is required to acquire a pseudo TTY in a local container.</_message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
@@ -70,7 +70,7 @@
 
         <action id="org.freedesktop.machine1.host-open-pty">
                 <_description>Acquire a pseudo TTY on the local host</_description>
-                <_message>Authentication is acquire a pseudo TTY on the local host.</_message>
+                <_message>Authentication is required to acquire a pseudo TTY on the local host.</_message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
-- 
cgit v1.2.3-54-g00ecf


From 7e9cc4361d3846d7fc3efc79ff7183df1dc588c8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 25 Aug 2015 18:37:31 +0200
Subject: core: drop spurious new line

---
 src/core/dbus-execute.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index b60025c48a..3c98a0b186 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -965,7 +965,6 @@ int bus_exec_context_set_transient_property(
 
                 return 1;
 
-
         } else if (streq(name, "TTYReset")) {
                 int b;
 
-- 
cgit v1.2.3-54-g00ecf


From 8bed4cbcc0d1bfc923ab98fbfc9dd15c3cff5934 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 25 Aug 2015 18:39:50 +0200
Subject: bus-util: make more properties settable in --property=

Add a couple of new properties to the supported set we can pass in
systemd-run's and systemd-nspawn's --property= switch.
---
 src/shared/bus-util.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 0df0594ea3..1bcb8903f3 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1382,7 +1382,8 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
 
         if (STR_IN_SET(field,
                        "CPUAccounting", "MemoryAccounting", "BlockIOAccounting",
-                       "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies")) {
+                       "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies",
+                       "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit")) {
 
                 r = parse_boolean(eq);
                 if (r < 0) {
@@ -1414,7 +1415,11 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
 
                 r = sd_bus_message_append(m, "v", "t", u);
 
-        } else if (STR_IN_SET(field, "User", "Group", "DevicePolicy", "KillMode"))
+        } else if (STR_IN_SET(field,
+                              "User", "Group", "DevicePolicy", "KillMode",
+                              "UtmpIdentifier", "UtmpMode", "PAMName", "TTYPath",
+                              "StandardInput", "StandardOutput", "StandardError",
+                              "Description", "Slice", "Type"))
                 r = sd_bus_message_append(m, "v", "s", eq);
 
         else if (streq(field, "DeviceAllow")) {
-- 
cgit v1.2.3-54-g00ecf