cryptsetup: do not order crypto DM devices against the cryptsetup service

[elogind.git] / src / socket.c

diff --git a/src/socket.c b/src/socket.c
index a8f8dc3a5e834a98fdc88f972775c52b21abf772..94991a35f58fc068982b6c1b01ea9224579d060f 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -715,7 +715,7 @@ static int fifo_address_create(
         r = mkfifo(path, socket_mode);
         umask(old_mask);
 
-        if (r < 0) {
+        if (r < 0 && errno != EEXIST) {
                 r = -errno;
                 goto fail;
         }
@@ -774,8 +774,10 @@ static int socket_open_fds(Socket *s) {
                                         return r;
 
                                 if (s->service && s->service->exec_command[SERVICE_EXEC_START])
-                                        if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0)
-                                                return r;
+                                        if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0) {
+                                                if (r != -EPERM)
+                                                        return r;
+                                        }
 
                                 know_label = true;
                         }