diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index cb11199ad3f..76339486458 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -941,12 +941,12 @@ effect unless UtmpIdentifier= is set too. If init is set, only an INIT_PROCESS entry is generated and the - invoked process must implement a getty - compatible utmp/wtmp logic. If login is - set, first an INIT_PROCESS entry, - followed by an LOGIN_PROCESS entry is - generated. In this case the invoked process must implement a - getty-compatible utmp/wtmp logic. If + login is set, first an + INIT_PROCESS entry, followed by an + LOGIN_PROCESS entry is generated. In + this case the invoked process must implement a login1-compatible utmp/wtmp logic. If user is set, first an INIT_PROCESS entry, then a diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index b60025c48a7..3c98a0b1862 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 6e35c5c0454..69f78a5c250 100644 --- a/src/machine/org.freedesktop.machine1.policy.in +++ b/src/machine/org.freedesktop.machine1.policy.in @@ -60,7 +60,7 @@ <_description>Acquire a pseudo TTY in a local container - <_message>Authentication is acquire a pseudo TTY in a local container. + <_message>Authentication is required to acquire a pseudo TTY in a local container. auth_admin auth_admin @@ -70,7 +70,7 @@ <_description>Acquire a pseudo TTY on the local host - <_message>Authentication is acquire a pseudo TTY on the local host. + <_message>Authentication is required to acquire a pseudo TTY on the local host. auth_admin auth_admin diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 0df0594ea3e..1bcb8903f38 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")) {