chiark / gitweb /
shared/mkdir: do not set errno in addition to return value
[elogind.git] / src / shared / path-lookup.c
index 1e5bb858e852d0325ff30089dc285601e9f68fd0..fb2c2c233a0d86c7c0814368762ae3e3f41708a5 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "util.h"
-#include "mkdir.h"
 #include "strv.h"
 #include "path-util.h"
 #include "path-lookup.h"
+#include "install.h"
 
 int user_config_home(char **config_home) {
         const char *e;
@@ -222,14 +220,14 @@ static char** user_dirs(
 
 char **generator_paths(SystemdRunningAs running_as) {
         if (running_as == SYSTEMD_USER)
-                return strv_new("/etc/systemd/user-generators",
-                                "/run/systemd/user-generators",
+                return strv_new("/run/systemd/user-generators",
+                                "/etc/systemd/user-generators",
                                 "/usr/local/lib/systemd/user-generators",
                                 USER_GENERATOR_PATH,
                                 NULL);
         else
-                return strv_new("/etc/systemd/system-generators",
-                                "/run/systemd/system-generators",
+                return strv_new("/run/systemd/system-generators",
+                                "/etc/systemd/system-generators",
                                 "/usr/local/lib/systemd/system-generators",
                                 SYSTEM_GENERATOR_PATH,
                                 NULL);