diff options
| -rw-r--r-- | man/systemd.exec.xml | 12 | ||||
| -rw-r--r-- | src/core/dbus-execute.c | 1 | ||||
| -rw-r--r-- | src/machine/org.freedesktop.machine1.policy.in | 4 | ||||
| -rw-r--r-- | src/shared/bus-util.c | 9 |
4 files changed, 15 insertions, 11 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index cb11199ad3..7633948645 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -941,12 +941,12 @@ effect unless <varname>UtmpIdentifier=</varname> is set too. If <literal>init</literal> is set, only an <constant>INIT_PROCESS</constant> entry is generated and the - invoked process must implement a <command>getty</command> - compatible utmp/wtmp logic. If <literal>login</literal> is - set, first an <constant>INIT_PROCESS</constant> entry, - followed by an <constant>LOGIN_PROCESS</constant> entry is - generated. In this case the invoked process must implement a - <citerefentry + invoked process must implement a + <command>getty</command>-compatible utmp/wtmp logic. If + <literal>login</literal> is set, first an + <constant>INIT_PROCESS</constant> entry, followed by an + <constant>LOGIN_PROCESS</constant> entry is generated. In + this case the invoked process must implement a <citerefentry project='die-net'><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>-compatible utmp/wtmp logic. If <literal>user</literal> is set, first an <constant>INIT_PROCESS</constant> entry, then a 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; 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> 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")) { |