Merge pull request #1667 from evverx/run-protect-system

systemd-run can launch units with ProtectSystem
This commit is contained in:
Lennart Poettering
2015-10-25 13:56:40 +01:00
4 changed files with 30 additions and 2 deletions
+2 -1
View File
@@ -85,7 +85,8 @@ _systemd_run() {
PrivateNetwork= NoNewPrivileges= WorkingDirectory= RootDirectory=
TTYPath= SyslogIdentifier= SyslogLevelPrefix= SyslogLevel=
SyslogFacility= TimerSlackNSec= OOMScoreAdjust= ReadWriteDirectories=
ReadOnlyDirectories= InaccessibleDirectories= EnvironmentFile='
ReadOnlyDirectories= InaccessibleDirectories= EnvironmentFile=
ProtectSystem='
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
+1
View File
@@ -39,6 +39,7 @@ _arguments \
TTYPath= SyslogIdentifier= SyslogLevelPrefix= SyslogLevel= \
SyslogFacility= TimerSlackNSec= OOMScoreAdjust= ReadWriteDirectories= \
ReadOnlyDirectories= InaccessibleDirectories= EnvironmentFile= \
ProtectSystem= \
))' \
'--description=[Description for unit]:description' \
'--slice=[Run in the specified slice]:slices:__slices' \
+26
View File
@@ -1334,6 +1334,32 @@ int bus_exec_context_set_transient_property(
return 1;
} else if (streq(name, "ProtectSystem")) {
const char *s;
ProtectSystem ps;
r = sd_bus_message_read(message, "s", &s);
if (r < 0)
return r;
r = parse_boolean(s);
if (r > 0)
ps = PROTECT_SYSTEM_YES;
else if (r == 0)
ps = PROTECT_SYSTEM_NO;
else {
ps = protect_system_from_string(s);
if (ps < 0)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Failed to parse protect system value");
}
if (mode != UNIT_CHECK) {
c->protect_system = ps;
unit_write_drop_in_private_format(u, mode, name, "%s=%s\n", name, s);
}
return 1;
} else if (rlimit_from_string(name) >= 0) {
uint64_t rl;
rlim_t x;
+1 -1
View File
@@ -1507,7 +1507,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
"UtmpIdentifier", "UtmpMode", "PAMName", "TTYPath",
"StandardInput", "StandardOutput", "StandardError",
"Description", "Slice", "Type", "WorkingDirectory",
"RootDirectory", "SyslogIdentifier"))
"RootDirectory", "SyslogIdentifier", "ProtectSystem"))
r = sd_bus_message_append(m, "v", "s", eq);
else if (streq(field, "SyslogLevel")) {