#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;
const char *password,
const char *options) {
- _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = 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;
return log_oom();
f = fopen(p, "wxe");
- if (!f) {
- log_error("Failed to create unit file %s: %m", p);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", p);
fputs(
"# Automatically generated by systemd-cryptsetup-generator\n\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)
if (!uu)
return log_oom();
- if (is_device_path(uu)) {
- _cleanup_free_ char *dd;
+ if (!path_equal(uu, "/dev/null")) {
+
+ if (is_device_path(uu)) {
+ _cleanup_free_ char *dd;
- dd = unit_name_from_path(uu, ".device");
- if (!dd)
- return log_oom();
+ 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);
+ 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);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write file %s: %m", p);
from = strappenda("../", n);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
free(to);
if (!nofail)
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
}
free(to);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
if (!noauto && !nofail) {
-
- 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 < 0) {
- log_error("Failed to write device drop-in: %s", strerror(-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;
if (!arg_keyfile)
return log_oom();
- } else if (startswith(key, "luks.") || startswith(key, "rd.luks."))
- log_warning("Unknown kernel switch %s. Ignoring.", key);
+ }
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_item) < 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;