summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-08 14:36:17 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-09 12:27:34 +0100
commit0d6671b2ef4b5593c6bb3a04ed9ebc24bac69bc8 (patch)
tree229343b58a96743177236ec9a21180086f83495a
parent7e684baf9038b536a511886a4d0a49554d128c7d (diff)
downloadsystemd-0d6671b2ef4b5593c6bb3a04ed9ebc24bac69bc8.tar.gz
shared/path-lookup: rename user control dirs to "user.control"
$ diff -u <(old/systemd-analyze --user unit-paths) <(new/systemd-analyze --user unit-paths)|colordiff --- /proc/self/fd/14 2018-02-08 14:36:34.190046129 +0100 +++ /proc/self/fd/15 2018-02-08 14:36:34.190046129 +0100 @@ -1,5 +1,5 @@ -/home/zbyszek/.config/systemd/system.control -/run/user/1000/systemd/system.control +/home/zbyszek/.config/systemd/user.control +/run/user/1000/systemd/user.control /run/user/1000/systemd/transient ... Strictly speaking, online upgrades of user instances through daemon-reexec will be broken. We can get away with this since a) reexecs of the user instance are not commonly done, at least package upgrade scripts don't do this afawk. b) cgroups aren't delegateable on cgroupsv1 there's little reason to use "systemctl set-property" for --user mode
-rw-r--r--src/shared/path-lookup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 426b936510..5f31831c99 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -420,11 +420,11 @@ static int acquire_control_dirs(UnitFileScope scope, char **persistent, char **r
}
case UNIT_FILE_USER:
- r = xdg_user_config_dir(&a, "/systemd/system.control");
+ r = xdg_user_config_dir(&a, "/systemd/user.control");
if (r < 0 && r != -ENXIO)
return r;
- r = xdg_user_runtime_dir(runtime, "/systemd/system.control");
+ r = xdg_user_runtime_dir(runtime, "/systemd/user.control");
if (r < 0) {
if (r != -ENXIO)
return r;