diff options
| author | Michal Sekletar <msekleta@redhat.com> | 2018-09-04 19:51:14 +0200 |
|---|---|---|
| committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2018-12-11 17:10:46 +0100 |
| commit | 81df5f597257bd2579246de6182c4949b27396eb (patch) | |
| tree | b9ea30aea2f355042b2c95d4889829133c529607 | |
| parent | 95bfd1d2f52698604e44c17dba2082f61b5f8eab (diff) | |
| download | systemd-81df5f597257bd2579246de6182c4949b27396eb.tar.gz | |
cryptsetup-generator: don't return error if target directory already exists
(cherry-picked from commit 579875bc4a59b917fa32519e3d96d56dc591ad1e)
Related: #1656869
| -rw-r--r-- | src/cryptsetup/cryptsetup-generator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 52391bd185..03c513c26e 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -53,16 +53,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) |