#include "mkdir.h"
#include "strv.h"
#include "fileio.h"
+#include "path-util.h"
+#include "dropin.h"
+#include "generator.h"
static const char *arg_dest = "/tmp";
static bool arg_enabled = true;
static bool arg_read_crypttab = true;
-
-static char **arg_disks;
-static char **arg_options;
-static char *arg_keyfile;
-
+static char **arg_disks = NULL;
+static char **arg_options = NULL;
+static char *arg_keyfile = NULL;
static bool has_option(const char *haystack, const char *needle) {
const char *f = haystack;
const char *password,
const char *options) {
- _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
+ _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *to = NULL, *e = NULL,
+ *filtered = NULL;
_cleanup_fclose_ FILE *f = NULL;
bool noauto, nofail, tmp, swap;
+ char *from;
+ int r;
assert(name);
assert(device);
return -EINVAL;
}
- n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
+ e = unit_name_escape(name);
+ if (!e)
+ return log_oom();
+
+ n = unit_name_build("systemd-cryptsetup", e, ".service");
if (!n)
return log_oom();
f = fopen(p, "wxe");
if (!f) {
- log_error("Failed to create unit file %s: %m", p);
+ log_error_errno(errno, "Failed to create unit file %s: %m", p);
return -errno;
}
"# 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"
+ "Documentation=man:crypttab(5) man:systemd-cryptsetup-generator(8) man:systemd-cryptsetup@.service(8)\n"
"SourcePath=/etc/crypttab\n"
- "Conflicts=umount.target\n"
"DefaultDependencies=no\n"
+ "Conflicts=umount.target\n"
"BindsTo=dev-mapper-%i.device\n"
"IgnoreOnIsolate=true\n"
- "After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
+ "After=cryptsetup-pre.target\n",
f);
if (!nofail)
"Before=cryptsetup.target\n");
if (password) {
- if (streq(password, "/dev/urandom") ||
- streq(password, "/dev/random") ||
- streq(password, "/dev/hw_random"))
+ if (STR_IN_SET(password, "/dev/urandom", "/dev/random", "/dev/hw_random"))
fputs("After=systemd-random-seed.service\n", f);
-
else if (!streq(password, "-") && !streq(password, "none")) {
- _cleanup_free_ char *uu = fstab_node_to_udev_node(password);
- if (uu == NULL)
+ _cleanup_free_ char *uu;
+
+ uu = fstab_node_to_udev_node(password);
+ if (!uu)
return log_oom();
- if (is_device_path(uu)) {
- _cleanup_free_ char *dd = unit_name_from_path(uu, ".device");
- if (dd == NULL)
- return log_oom();
+ if (!path_equal(uu, "/dev/null")) {
+
+ if (is_device_path(uu)) {
+ _cleanup_free_ char *dd;
- fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
- } else
- fprintf(f, "RequiresMountsFor=%s\n", password);
+ dd = unit_name_from_path(uu, ".device");
+ if (!dd)
+ return log_oom();
+
+ fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
+ } else
+ fprintf(f, "RequiresMountsFor=%s\n", password);
+ }
}
}
"RequiresMountsFor=%s\n",
u);
+ r = generator_write_timeouts(arg_dest, device, name, options, &filtered);
+ if (r < 0)
+ return r;
+
fprintf(f,
"\n[Service]\n"
"Type=oneshot\n"
"TimeoutSec=0\n" /* the binary handles timeouts anyway */
"ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n"
"ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
- name, u, strempty(password), strempty(options),
+ name, u, strempty(password), strempty(filtered),
name);
if (tmp)
name);
fflush(f);
-
if (ferror(f)) {
- log_error("Failed to write file %s: %m", p);
+ log_error_errno(errno, "Failed to write file %s: %m", p);
return -errno;
}
- if (asprintf(&from, "../%s", n) < 0)
- return log_oom();
+ from = strappenda("../", n);
if (!noauto) {
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
+ log_error_errno(errno, "Failed to create symlink %s: %m", to);
return -errno;
}
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
+ log_error_errno(errno, "Failed to create symlink %s: %m", to);
return -errno;
}
}
- e = unit_name_escape(name);
- if (!e)
- return log_oom();
-
free(to);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
if (!to)
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
+ log_error_errno(errno, "Failed to create symlink %s: %m", to);
return -errno;
}
if (!noauto && !nofail) {
- int r;
- free(p);
- p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL);
- if (!p)
+ _cleanup_free_ char *dmname;
+ dmname = strjoin("dev-mapper-", e, ".device", NULL);
+ if (!dmname)
return log_oom();
- mkdir_parents_label(p, 0755);
-
- r = write_string_file(p,
- "# Automatically generated by systemd-cryptsetup-generator\n\n"
- "[Unit]\n"
- "JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */
- if (r)
- return r;
+ r = write_drop_in(arg_dest, dmname, 90, "device-timeout",
+ "# Automatically generated by systemd-cryptsetup-generator \n\n"
+ "[Unit]\nJobTimeoutSec=0");
+ if (r < 0)
+ return log_error_errno(r, "Failed to write device drop-in: %m");
}
return 0;
}
-static int parse_proc_cmdline_word(const char *word) {
+static int parse_proc_cmdline_item(const char *key, const char *value) {
int r;
- if (startswith(word, "luks=")) {
- r = parse_boolean(word + 5);
+ if (STR_IN_SET(key, "luks", "rd.luks") && value) {
+
+ r = parse_boolean(value);
if (r < 0)
- log_warning("Failed to parse luks switch %s. Ignoring.", word + 5);
+ log_warning("Failed to parse luks switch %s. Ignoring.", value);
else
arg_enabled = r;
- } else if (startswith(word, "rd.luks=")) {
-
- if (in_initrd()) {
- r = parse_boolean(word + 8);
- if (r < 0)
- log_warning("Failed to parse luks switch %s. Ignoring.", word + 8);
- else
- arg_enabled = r;
- }
+ } else if (STR_IN_SET(key, "luks.crypttab", "rd.luks.crypttab") && value) {
- } else if (startswith(word, "luks.crypttab=")) {
- r = parse_boolean(word + 14);
+ r = parse_boolean(value);
if (r < 0)
- log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 14);
+ log_warning("Failed to parse luks crypttab switch %s. Ignoring.", value);
else
arg_read_crypttab = r;
- } else if (startswith(word, "rd.luks.crypttab=")) {
-
- if (in_initrd()) {
- r = parse_boolean(word + 17);
- if (r < 0)
- log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 17);
- else
- arg_read_crypttab = r;
- }
+ } else if (STR_IN_SET(key, "luks.uuid", "rd.luks.uuid") && value) {
- } else if (startswith(word, "luks.uuid=")) {
- if (strv_extend(&arg_disks, word + 10) < 0)
+ if (strv_extend(&arg_disks, value) < 0)
return log_oom();
- } else if (startswith(word, "rd.luks.uuid=")) {
-
- if (in_initrd()) {
- if (strv_extend(&arg_disks, word + 13) < 0)
- return log_oom();
- }
+ } else if (STR_IN_SET(key, "luks.options", "rd.luks.options") && value) {
- } else if (startswith(word, "luks.options=")) {
- if (strv_extend(&arg_options, word + 13) < 0)
+ if (strv_extend(&arg_options, value) < 0)
return log_oom();
- } else if (startswith(word, "rd.luks.options=")) {
+ } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) {
- if (in_initrd()) {
- if (strv_extend(&arg_options, word + 16) < 0)
- return log_oom();
- }
-
- } else if (startswith(word, "luks.key=")) {
free(arg_keyfile);
- arg_keyfile = strdup(word + 9);
+ arg_keyfile = strdup(value);
if (!arg_keyfile)
return log_oom();
- } else if (startswith(word, "rd.luks.key=")) {
-
- if (in_initrd()) {
- free(arg_keyfile);
- arg_keyfile = strdup(word + 12);
- if (!arg_keyfile)
- return log_oom();
- }
-
- } else if (startswith(word, "luks.") ||
- (in_initrd() && startswith(word, "rd.luks."))) {
-
- log_warning("Unknown kernel switch %s. Ignoring.", word);
}
return 0;
_cleanup_strv_free_ char **disks_done = NULL;
_cleanup_fclose_ FILE *f = NULL;
unsigned n = 0;
- int r = EXIT_FAILURE, r2 = EXIT_FAILURE;
+ int r = EXIT_FAILURE, r2 = EXIT_FAILURE, z;
char **i;
if (argc > 1 && argc != 4) {
umask(0022);
- if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
- goto cleanup;
+ z = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (z < 0)
+ log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m");
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;
if (errno == ENOENT)
r = EXIT_SUCCESS;
else
- log_error("Failed to open /etc/crypttab: %m");
+ log_error_errno(errno, "Failed to open /etc/crypttab: %m");
goto next;
}
if (fstat(fileno(f), &st) < 0) {
- log_error("Failed to stat /etc/crypttab: %m");
+ log_error_errno(errno, "Failed to stat /etc/crypttab: %m");
goto next;
}
}
/*
- If options are specified on the kernel commandline, let them override
+ If options are specified on the kernel command line, let them override
the ones from crypttab.
*/
STRV_FOREACH(i, arg_options) {
if (k == 2 && streq(proc_uuid, device + 5)) {
free(options);
options = strdup(p);
- if (!proc_options) {
+ if (!options) {
log_oom();
goto cleanup;
}
if (arg_options) {
/*
- If options are specified on the kernel commandline, use them.
+ If options are specified on the kernel command line, use them.
*/
char **j;
k = sscanf(s, "%m[0-9a-fA-F-]=%ms", &proc_uuid, &proc_options);
if (k == 2) {
if (streq(proc_uuid, device + 5)) {
- if (options)
- free(options);
- options = strdup(proc_options);
- if (!options) {
- log_oom();
- goto cleanup;
- }
+ free(options);
+ options = proc_options;
+ proc_options = NULL;
}
} else if (!options) {
/*
~ianmdlvl / elogind.git / blobdiff