Hi, when cryptoloop files are present in /etc/crypttab, systemd is not correctly creating dependencies for mounting them. Attached patch fixes this issue. -- Frederic Crozat <fcro...@suse.com> SUSE
>From 96e7b52ed48e423a62a50677a678d59129a65453 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcro...@suse.com> Date: Thu, 8 Dec 2011 13:51:17 +0100 Subject: [PATCH] cryptsetup-generator: correctly create unit for cryptoloop
Ensure unit created for cryptoloop is path unit and not a device one. --- src/cryptsetup-generator.c | 51 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c index a48b7a4..0cae431 100644 --- a/src/cryptsetup-generator.c +++ b/src/cryptsetup-generator.c @@ -64,7 +64,7 @@ static int create_disk( const char *password, const char *options) { - char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL; + char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL, *path_file = NULL; int r; FILE *f = NULL; bool noauto, nofail; @@ -93,10 +93,50 @@ static int create_disk( goto fail; } - if (!(d = unit_name_from_path(u, ".device"))) { - r = -ENOMEM; - log_error("Failed to allocate device name."); - goto fail; + if (!startswith(device,"/dev/")) { + + if (!(d = unit_name_build_escape("cryptsetup", name, ".path"))) { + r = -ENOMEM; + log_error("Failed to allocate path name."); + goto fail; + } + + if (asprintf(&path_file, "%s/%s", arg_dest, d) < 0) { + r = -ENOMEM; + log_error("Failed to allocate unit file name."); + goto fail; + } + + if (!(f = fopen(path_file, "wxe"))) { + r = -errno; + log_error("Failed to create unit file: %m"); + goto fail; + } + + fprintf(f, + "[Unit]\n" + "Description=Cryptography Setup for %s\n" + "DefaultDependencies=no\n" + "[Path]\n" + "PathExists=%s\n", + device, device); + + fflush(f); + + if (ferror(f)) { + r = -errno; + log_error("Failed to write file: %m"); + goto fail; + } + + f = NULL; + } else { + + if (!(d = unit_name_from_path(u, ".device"))) { + r = -ENOMEM; + log_error("Failed to allocate device name."); + goto fail; + } } if (!(f = fopen(p, "wxe"))) { @@ -222,6 +262,7 @@ fail: free(n); free(d); free(e); + free(path_file); free(from); free(to); -- 1.7.7
_______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel