diff options
| author | Michal Sekletar <msekleta@redhat.com> | 2018-09-04 19:51:14 +0200 |
|---|---|---|
| committer | Michal Sekletar <msekleta@redhat.com> | 2018-10-30 09:02:34 +0100 |
| commit | 579875bc4a59b917fa32519e3d96d56dc591ad1e (patch) | |
| tree | 29107c5830213909447e9b1487cf70dfc96bea07 /src | |
| parent | b9e7ea48411af69c398de6d4937227a770be0c59 (diff) | |
| download | systemd-579875bc4a59b917fa32519e3d96d56dc591ad1e.tar.gz | |
cryptsetup-generator: don't return error if target directory already exists
Diffstat (limited to 'src')
| -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 c3a4509030..892e41ce18 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) |