From: Sven Eden <yamakuzure@gmx.net>
Date: Mon, 23 Apr 2018 16:40:49 +0000 (+0200)
Subject: Move /var/lib/systemd/linger to /var/lib/elogind/.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=732414c8f7d9520fd8094a5ee507e0caecef29b7;p=elogind.git

Move /var/lib/systemd/linger to /var/lib/elogind/.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 0b9aea757..c3b056568 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1227,7 +1227,7 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu
         if (r == 0)
                 return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
 
-        mkdir_p_label("/var/lib/systemd", 0755);
+        mkdir_p_label("/var/lib/elogind", 0755);
 
         r = mkdir_safe_label("/var/lib/elogind/linger", 0755, 0, 0, false);
         if (r < 0)
@@ -1237,7 +1237,7 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu
         if (!cc)
                 return -ENOMEM;
 
-        path = strjoina("/var/lib/systemd/linger/", cc);
+        path = strjoina("/var/lib/elogind/linger/", cc);
         if (b) {
                 User *u;
 
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 76cb2e1eb..2d80d7325 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -708,7 +708,7 @@ int user_check_linger_file(User *u) {
         if (!cc)
                 return -ENOMEM;
 
-        p = strjoina("/var/lib/systemd/linger/", cc);
+        p = strjoina("/var/lib/elogind/linger/", cc);
 
         return access(p, F_OK) >= 0;
 }
diff --git a/src/login/logind.c b/src/login/logind.c
index b76100bfc..3586d3ffd 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -369,12 +369,12 @@ static int manager_enumerate_linger_users(Manager *m) {
 
         assert(m);
 
-        d = opendir("/var/lib/systemd/linger");
+        d = opendir("/var/lib/elogind/linger");
         if (!d) {
                 if (errno == ENOENT)
                         return 0;
 
-                return log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m");
+                return log_error_errno(errno, "Failed to open /var/lib/elogind/linger/: %m");
         }
 
         FOREACH_DIRENT(de, d, return -errno) {