From: Michal Sekletar <msekleta@redhat.com>
Date: Tue, 4 Sep 2018 17:51:14 +0000 (+0200)
Subject: cryptsetup-generator: don't return error if target directory already exists
X-Git-Tag: v240~428^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=579875bc4a59b917fa32519e3d96d56dc591ad1e;p=thirdparty%2Fsystemd.git

cryptsetup-generator: don't return error if target directory already exists
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index c3a4509030f..892e41ce18a 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -54,16 +54,16 @@ static int generate_keydev_mount(const char *name, const char *keydev, char **un
                 return r;
 
         r = mkdir("/run/systemd/cryptsetup", 0700);
-        if (r < 0)
-                return r;
+        if (r < 0 && errno != EEXIST)
+                return -errno;
 
         where = strjoin("/run/systemd/cryptsetup/keydev-", name);
         if (!where)
                 return -ENOMEM;
 
         r = mkdir(where, 0700);
-        if (r < 0)
-                return r;
+        if (r < 0 && errno != EEXIST)
+                return -errno;
 
         r = unit_name_from_path(where, ".mount", &u);
         if (r < 0)