picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Michal Sekletar 2018-09-04 19:51:14 +02:00
parent b9e7ea4841
commit 579875bc4a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cryptsetup/cryptsetup-generator.c
View file

@ -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)