From 899feb7225ccd13cccaf6956353d82b7ce223aa5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 16 Nov 2018 14:30:29 +0100 Subject: [PATCH] man: let's deprecate PermissionsStartOnly= The concept is redundant and predates the special chars that do the same in ExecStar=. Let's settle on advertising just the latter, and hide PermissionsStartOnly= from the docs (even if we continue supporting it). --- TODO | 2 +- man/systemd.service.xml | 18 ------------------ src/core/dbus-service.c | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/TODO b/TODO index 86db6fcd47..674aa50df5 100644 --- a/TODO +++ b/TODO @@ -225,7 +225,7 @@ Features: * taint systemd if there are fewer than 65536 users assigned (userns) to the system. -* deprecate PermissionsStartOnly= and RootDirectoryStartOnly= in favour of the ExecStart= prefix chars +* deprecate RootDirectoryStartOnly= in favour of a new ExecStart= prefix char * add a new RuntimeDirectoryPreserve= mode that defines a similar lifecycle for the runtime dir as we maintain for the fdstore: i.e. keep it around as long diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 0ce96cf3cb..4c33ed0b68 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -832,24 +832,6 @@ RestartPreventExitStatus=. - - PermissionsStartOnly= - Takes a boolean argument. If true, the - permission-related execution options, as configured with - User= and similar options (see - systemd.exec5 - for more information), are only applied to the process started - with - ExecStart=, and not to the various other - ExecStartPre=, - ExecStartPost=, - ExecReload=, - ExecStop=, and - ExecStopPost= - commands. If false, the setting is applied to all configured - commands the same way. Defaults to false. - - RootDirectoryStartOnly= Takes a boolean argument. If true, the root diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 01094a6212..fdf6120610 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -105,7 +105,7 @@ const sd_bus_vtable bus_service_vtable[] = { SD_BUS_PROPERTY("RuntimeMaxUSec", "t", bus_property_get_usec, offsetof(Service, runtime_max_usec), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("WatchdogUSec", "t", bus_property_get_usec, offsetof(Service, watchdog_usec), SD_BUS_VTABLE_PROPERTY_CONST), BUS_PROPERTY_DUAL_TIMESTAMP("WatchdogTimestamp", offsetof(Service, watchdog_timestamp), 0), - SD_BUS_PROPERTY("PermissionsStartOnly", "b", bus_property_get_bool, offsetof(Service, permissions_start_only), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("PermissionsStartOnly", "b", bus_property_get_bool, offsetof(Service, permissions_start_only), SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN), /* 😷 deprecated */ SD_BUS_PROPERTY("RootDirectoryStartOnly", "b", bus_property_get_bool, offsetof(Service, root_directory_start_only), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RemainAfterExit", "b", bus_property_get_bool, offsetof(Service, remain_after_exit), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("GuessMainPID", "b", bus_property_get_bool, offsetof(Service, guess_main_pid), SD_BUS_VTABLE_PROPERTY_CONST),