system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-04 15:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1033 from poettering/machine-fixes

Browse source 
misc machine fixes
This commit is contained in:
Tom Gundersen 2015-08-25 18:50:44 +02:00
parent 498fb56739 8bed4cbcc0
commit 33c1c9745c
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
man/systemd.exec.xml
View file

@ -941,12 +941,12 @@
effect unless <varname>UtmpIdentifier=</varname> is set effect unless <varname>UtmpIdentifier=</varname> is set
too. If <literal>init</literal> is set, only an too. If <literal>init</literal> is set, only an
<constant>INIT_PROCESS</constant> entry is generated and the <constant>INIT_PROCESS</constant> entry is generated and the
invoked process must implement a <command>getty</command> invoked process must implement a
compatible utmp/wtmp logic. If <literal>login</literal> is <command>getty</command>-compatible utmp/wtmp logic. If
set, first an <constant>INIT_PROCESS</constant> entry, <literal>login</literal> is set, first an
followed by an <constant>LOGIN_PROCESS</constant> entry is <constant>INIT_PROCESS</constant> entry, followed by an
generated. In this case the invoked process must implement a <constant>LOGIN_PROCESS</constant> entry is generated. In
<citerefentry this case the invoked process must implement a <citerefentry
project='die-net'><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>-compatible project='die-net'><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>-compatible
utmp/wtmp logic. If <literal>user</literal> is set, first an utmp/wtmp logic. If <literal>user</literal> is set, first an
<constant>INIT_PROCESS</constant> entry, then a <constant>INIT_PROCESS</constant> entry, then a

1
src/core/dbus-execute.c
View file

@ -965,7 +965,6 @@ int bus_exec_context_set_transient_property(
return 1; return 1;
} else if (streq(name, "TTYReset")) { } else if (streq(name, "TTYReset")) {
int b; int b;

4
src/machine/org.freedesktop.machine1.policy.in
View file

@ -60,7 +60,7 @@
<action id="org.freedesktop.machine1.open-pty"> <action id="org.freedesktop.machine1.open-pty">
<_description>Acquire a pseudo TTY in a local container</_description> <_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> <defaults>
<allow_any>auth_admin</allow_any> <allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive> <allow_inactive>auth_admin</allow_inactive>
@ -70,7 +70,7 @@
<action id="org.freedesktop.machine1.host-open-pty"> <action id="org.freedesktop.machine1.host-open-pty">
<_description>Acquire a pseudo TTY on the local host</_description> <_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> <defaults>
<allow_any>auth_admin</allow_any> <allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive> <allow_inactive>auth_admin</allow_inactive>

9
src/shared/bus-util.c
View file

@ -1382,7 +1382,8 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
if (STR_IN_SET(field, if (STR_IN_SET(field,
"CPUAccounting", "MemoryAccounting", "BlockIOAccounting", "CPUAccounting", "MemoryAccounting", "BlockIOAccounting",
"SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies")) { "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies",
"IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit")) {
r = parse_boolean(eq); r = parse_boolean(eq);
if (r < 0) { 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); 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); r = sd_bus_message_append(m, "v", "s", eq);
else if (streq(field, "DeviceAllow")) { else if (streq(field, "DeviceAllow")) {