Reverted accidential renaming of /run/systemd to /run/elogind. Applications using...

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index da0624e6fb45c42514fb45ca82252bb37c158fcb..79f362fb6ed41ceac0bb34bd7d48029dd5685b2b 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -979,7 +979,6 @@ static void cgroup_context_apply(
                                 "/dev/urandom\0" "rwm\0"
                                 "/dev/tty\0" "rwm\0"
                                 "/dev/pts/ptmx\0" "rw\0" /* /dev/pts/ptmx may not be duplicated, but accessed */
-                                /* Allow /run/elogind/inaccessible/{chr,blk} devices for mapping InaccessiblePaths */
                                 /* Allow /run/systemd/inaccessible/{chr,blk} devices for mapping InaccessiblePaths */
                                 "-/run/systemd/inaccessible/chr\0" "rwm\0"
                                 "-/run/systemd/inaccessible/blk\0" "rwm\0";

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index aff699674d6f7fcf62b2bc8d0f79e9d4251a0381..0b9aea757152eaffd45575404df32724cc69b83a 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1989,7 +1989,7 @@ static int update_schedule_file(Manager *m) {
 
         assert(m);
 
-        r = mkdir_safe_label("/run/elogind/shutdown", 0755, 0, 0, false);
+        r = mkdir_safe_label("/run/systemd/shutdown", 0755, 0, 0, false);
         if (r < 0)
                 return log_error_errno(r, "Failed to create shutdown subdirectory: %m");
 

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 9bfde30ab801f3f260a5617958f77464ff5f6200..8a6487ea45e899ab51e06ceed45354cb44982050 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -87,7 +87,7 @@ int inhibitor_save(Inhibitor *i) {
 
         assert(i);
 
-        r = mkdir_safe_label("/run/elogind/inhibit", 0755, 0, 0, false);
+        r = mkdir_safe_label("/run/systemd/inhibit", 0755, 0, 0, false);
         if (r < 0)
                 goto fail;
 
@@ -291,7 +291,7 @@ int inhibitor_create_fifo(Inhibitor *i) {
 
         /* Create FIFO */
         if (!i->fifo_path) {
-                r = mkdir_safe_label("/run/elogind/inhibit", 0755, 0, 0, false);
+                r = mkdir_safe_label("/run/systemd/inhibit", 0755, 0, 0, false);
                 if (r < 0)
                         return r;
 

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 0301d670a6a5e130f4b786c6fa224e1e594c70fb..996ea3e13050f509b2d0d6ac390543381962708a 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -95,7 +95,7 @@ int seat_save(Seat *s) {
         if (!s->started)
                 return 0;
 
-        r = mkdir_safe_label("/run/elogind/seats", 0755, 0, 0, false);
+        r = mkdir_safe_label("/run/systemd/seats", 0755, 0, 0, false);
         if (r < 0)
                 goto fail;
 

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 6ae45f45a379db51bf8ca6e9838896e77ce18e79..7addb3070d8519864e287121224c8785cf859b33 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -185,7 +185,7 @@ int session_save(Session *s) {
         if (!s->started)
                 return 0;
 
-        r = mkdir_safe_label("/run/elogind/sessions", 0755, 0, 0, false);
+        r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0, false);
         if (r < 0)
                 goto fail;
 
@@ -1007,7 +1007,7 @@ int session_create_fifo(Session *s) {
 
         /* Create FIFO */
         if (!s->fifo_path) {
-                r = mkdir_safe_label("/run/elogind/sessions", 0755, 0, 0, false);
+                r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0, false);
                 if (r < 0)
                         return r;
 

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index ab6aef5146f90535e023edfd6f516a368431af6f..76cb2e1ebae4b09d3acf96e42ff901344d8a5e16 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -148,7 +148,7 @@ static int user_save_internal(User *u) {
         assert(u);
         assert(u->state_file);
 
-        r = mkdir_safe_label("/run/elogind/users", 0755, 0, 0, false);
+        r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0, false);
         if (r < 0)
                 goto fail;