#include "mkdir.h"
#include "virt.h"
#include "strv.h"
+#include "fileio.h"
static const char *arg_dest = "/tmp";
static bool arg_enabled = true;
noauto = has_option(options, "noauto");
nofail = has_option(options, "nofail");
- n = unit_name_build_escape("cryptsetup", name, ".service");
+ n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
if (!n) {
- r = -ENOMEM;
- log_error("Failed to allocate unit name.");
+ r = log_oom();
goto fail;
}
- p = join(arg_dest, "/", n, NULL);
+ p = strjoin(arg_dest, "/", n, NULL);
if (!p) {
- r = -ENOMEM;
- log_error("Failed to allocate unit file name.");
+ r = log_oom();
goto fail;
}
u = fstab_node_to_udev_node(device);
if (!u) {
- r = -ENOMEM;
- log_error("Failed to allocate device node.");
+ r = log_oom();
goto fail;
}
d = unit_name_from_path(u, ".device");
if (!d) {
- r = -ENOMEM;
- log_error("Failed to allocate device name.");
+ r = log_oom();
goto fail;
}
f = fopen(p, "wxe");
if (!f) {
r = -errno;
- log_error("Failed to create unit file: %m");
+ log_error("Failed to create unit file %s: %m", p);
goto fail;
}
"# Automatically generated by systemd-cryptsetup-generator\n\n"
"[Unit]\n"
"Description=Cryptography Setup for %%I\n"
+ "Documentation=man:systemd-cryptsetup@.service(8) man:crypttab(5)\n"
"SourcePath=/etc/crypttab\n"
"Conflicts=umount.target\n"
"DefaultDependencies=no\n"
- "BindTo=%s dev-mapper-%%i.device\n"
+ "BindsTo=%s dev-mapper-%%i.device\n"
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
"Before=umount.target\n",
d, d);
if (ferror(f)) {
r = -errno;
- log_error("Failed to write file: %m");
+ log_error("Failed to write file %s: %m", p);
goto fail;
}
if (asprintf(&from, "../%s", n) < 0) {
- r = -ENOMEM;
+ r = log_oom();
goto fail;
}
if (!noauto) {
- to = join(arg_dest, "/", d, ".wants/", n, NULL);
+ to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
if (!to) {
- r = -ENOMEM;
+ r = log_oom();
goto fail;
}
free(to);
if (!nofail)
- to = join(arg_dest, "/cryptsetup.target.requires/", n, NULL);
+ to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
else
- to = join(arg_dest, "/cryptsetup.target.wants/", n, NULL);
+ to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);
if (!to) {
- r = -ENOMEM;
+ r = log_oom();
goto fail;
}
}
e = unit_name_escape(name);
- to = join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
+ to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
if (!to) {
- r = -ENOMEM;
+ r = log_oom();
goto fail;
}
word = strndup(w, l);
if (!word) {
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
t = strv_append(arg_proc_cmdline_disks, word + 10);
if (!t) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
strv_free(arg_proc_cmdline_disks);
t = strv_append(arg_proc_cmdline_disks, word + 13);
if (!t) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
strv_free(arg_proc_cmdline_disks);
free(word);
}
+ strv_uniq(arg_proc_cmdline_disks);
+
r = 0;
finish:
int r = EXIT_SUCCESS;
unsigned n = 0;
char **i;
+ char **arg_proc_cmdline_disks_done = NULL;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
goto finish;
}
- STRV_FOREACH(i, arg_proc_cmdline_disks) {
- char *name, *device;
- const char *p = *i;
-
- if (startswith(p, "luks-"))
- p += 5;
+ if (arg_read_crypttab) {
+ f = fopen("/etc/crypttab", "re");
- name = strappend("luks-", *i);
- device = strappend("UUID=", *i);
+ if (!f) {
+ if (errno == ENOENT)
+ r = EXIT_SUCCESS;
+ else {
+ r = EXIT_FAILURE;
+ log_error("Failed to open /etc/crypttab: %m");
+ }
- if (!name || !device) {
- log_error("Out of memory");
- r = EXIT_FAILURE;
- free(name);
- free(device);
goto finish;
}
- if (create_disk(name, device, NULL, NULL) < 0)
- r = EXIT_FAILURE;
+ for (;;) {
+ char line[LINE_MAX], *l;
+ char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
+ int k;
- free(name);
- free(device);
- }
+ if (!fgets(line, sizeof(line), f))
+ break;
- if (!arg_read_crypttab)
- return r;
+ n++;
- f = fopen("/etc/crypttab", "re");
- if (!f) {
+ l = strstrip(line);
+ if (*l == '#' || *l == 0)
+ continue;
- if (errno == ENOENT)
- r = EXIT_SUCCESS;
- else {
- r = EXIT_FAILURE;
- log_error("Failed to open /etc/crypttab: %m");
- }
+ k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options);
+ if (k < 2 || k > 4) {
+ log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
+ r = EXIT_FAILURE;
+ goto next;
+ }
- goto finish;
+ if (arg_proc_cmdline_disks) {
+ /*
+ If luks UUIDs are specified on the kernel command line, use them as a filter
+ for /etc/crypttab and only generate units for those.
+ */
+ STRV_FOREACH(i, arg_proc_cmdline_disks) {
+ char *proc_device, *proc_name;
+ const char *p = *i;
+
+ if (startswith(p, "luks-"))
+ p += 5;
+
+ proc_name = strappend("luks-", p);
+ proc_device = strappend("UUID=", p);
+
+ if (!proc_name || !proc_device) {
+ log_oom();
+ r = EXIT_FAILURE;
+ free(proc_name);
+ free(proc_device);
+ goto finish;
+ }
+ if (streq(proc_device, device) || streq(proc_name, name)) {
+ char **t;
+
+ if (create_disk(name, device, password, options) < 0)
+ r = EXIT_FAILURE;
+
+ t = strv_append(arg_proc_cmdline_disks_done, p);
+ if (!t) {
+ r = log_oom();
+ goto finish;
+ }
+ strv_free(arg_proc_cmdline_disks_done);
+ arg_proc_cmdline_disks_done = t;
+ }
+
+ free(proc_device);
+ free(proc_name);
+ }
+ } else {
+ if (create_disk(name, device, password, options) < 0)
+ r = EXIT_FAILURE;
+ }
+
+ next:
+ free(name);
+ free(device);
+ free(password);
+ free(options);
+ }
}
- for (;;) {
- char line[LINE_MAX], *l;
- char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
- int k;
+ STRV_FOREACH(i, arg_proc_cmdline_disks) {
+ /*
+ Generate units for those UUIDs, which were specified
+ on the kernel command line and not yet written.
+ */
- if (!fgets(line, sizeof(line), f))
- break;
+ char *name, *device;
+ const char *p = *i;
- n++;
+ if (startswith(p, "luks-"))
+ p += 5;
- l = strstrip(line);
- if (*l == '#' || *l == 0)
+ if (strv_contains(arg_proc_cmdline_disks_done, p))
continue;
- k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options);
- if (k < 2 || k > 4) {
- log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
+ name = strappend("luks-", p);
+ device = strappend("UUID=", p);
+
+ if (!name || !device) {
+ log_oom();
r = EXIT_FAILURE;
- goto next;
+ free(name);
+ free(device);
+ goto finish;
}
- if (create_disk(name, device, password, options) < 0)
+ if (create_disk(name, device, NULL, "timeout=0") < 0)
r = EXIT_FAILURE;
- next:
free(name);
free(device);
- free(password);
- free(options);
}
finish:
fclose(f);
strv_free(arg_proc_cmdline_disks);
+ strv_free(arg_proc_cmdline_disks_done);
return r;
}
~ianmdlvl / elogind.git / blobdiff