mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-21 07:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hook more properties for transient units

Browse Source 
systemd-run can now launch units with PrivateTmp, PrivateDevices,
PrivateNetwork, NoNewPrivileges set.
This commit is contained in:
Gabriel de Perthuis 2015-09-10 16:45:28 +02:00
parent 85bc8c64e9
commit b9c50073fc
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/core/dbus-execute.c
View File

@ -933,7 +933,10 @@ int bus_exec_context_set_transient_property(
return 1; return 1;
} else if (streq(name, "IgnoreSIGPIPE")) { } else if (STR_IN_SET(name,
"IgnoreSIGPIPE", "TTYVHangup", "TTYReset",
"PrivateTmp", "PrivateDevices", "PrivateNetwork",
"NoNewPrivileges")) {
int b; int b;
r = sd_bus_message_read(message, "b", &b); r = sd_bus_message_read(message, "b", &b);
@ -941,39 +944,22 @@ int bus_exec_context_set_transient_property(
return r; return r;
if (mode != UNIT_CHECK) { if (mode != UNIT_CHECK) {
c->ignore_sigpipe = b; if (streq(name, "IgnoreSIGPIPE"))
c->ignore_sigpipe = b;
else if (streq(name, "TTYVHangup"))
c->tty_vhangup = b;
else if (streq(name, "TTYReset"))
c->tty_reset = b;
else if (streq(name, "PrivateTmp"))
c->private_tmp = b;
else if (streq(name, "PrivateDevices"))
c->private_devices = b;
else if (streq(name, "PrivateNetwork"))
c->private_network = b;
else if (streq(name, "NoNewPrivileges"))
c->no_new_privileges = b;
unit_write_drop_in_private_format(u, mode, name, "IgnoreSIGPIPE=%s\n", yes_no(b)); unit_write_drop_in_private_format(u, mode, name, "%s=%s\n", name, yes_no(b));
}
return 1;
} else if (streq(name, "TTYVHangup")) {
int b;
r = sd_bus_message_read(message, "b", &b);
if (r < 0)
return r;
if (mode != UNIT_CHECK) {
c->tty_vhangup = b;
unit_write_drop_in_private_format(u, mode, name, "TTYVHangup=%s\n", yes_no(b));
}
return 1;
} else if (streq(name, "TTYReset")) {
int b;
r = sd_bus_message_read(message, "b", &b);
if (r < 0)
return r;
if (mode != UNIT_CHECK) {
c->tty_reset = b;
unit_write_drop_in_private_format(u, mode, name, "TTYReset=%s\n", yes_no(b));
} }
return 1; return 1;

3
src/shared/bus-util.c
View File

@ -1423,7 +1423,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", "TasksAccounting", "CPUAccounting", "MemoryAccounting", "BlockIOAccounting", "TasksAccounting",
"SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies", "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies",
"IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit")) { "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit",
"PrivateTmp", "PrivateDevices", "PrivateNetwork", "NoNewPrivileges")) {
r = parse_boolean(eq); r = parse_boolean(eq);
if (r < 0) { if (r < 0) {