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

cryptsetup: automatically start cryptsetup when looking for mount source

This commit is contained in:
Lennart Poettering 2010-11-12 03:04:10 +01:00
parent f41c094c9f
commit 74715b82cb
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -84,6 +84,8 @@
* fsck-root.service/start gets queued twice
* tmpfiles: allow specification of .conf files on cmdline
External:
* patch kernel for xattr support in /dev, /proc/, /sys and /sys/fs/cgroup.

30
src/cryptsetup-generator.c
View File

@ -59,7 +59,7 @@ static int create_disk(
const char *password,
const char *options) {
char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL;
char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
int r;
FILE *f = NULL;
@ -139,6 +139,11 @@ static int create_disk(
goto fail;
}
if (asprintf(&from, "../%s", n) < 0) {
r = -ENOMEM;
goto fail;
}
if (!options || !has_option(options, "noauto")) {
if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {
@ -146,11 +151,6 @@ static int create_disk(
goto fail;
}
if (asprintf(&from, "../%s", n) < 0) {
r = -ENOMEM;
goto fail;
}
mkdir_parents(to, 0755);
if (symlink(from, to) < 0) {
@ -160,12 +160,30 @@ static int create_disk(
}
}
free(to);
to = NULL;
e = unit_name_escape(name);
if (asprintf(&to, "%s/dev-mapper-%s.device.wants/%s", arg_dest, e, n) < 0) {
r = -ENOMEM;
goto fail;
}
mkdir_parents(to, 0755);
if (symlink(from, to) < 0) {
log_error("Failed to create symlink '%s' to '%s': %m", from, to);
r = -errno;
goto fail;
}
r = 0;
fail:
free(p);
free(n);
free(d);
free(e);
free(from);
free(to);