const char *f = haystack;
size_t l;
+ assert(needle);
+
+ if (!haystack)
+ return false;
+
l = strlen(needle);
while ((f = strstr(f, needle))) {
fprintf(f,
"[Unit]\n"
- "Description=Cryptography Setup for %%f\n"
+ "Description=Cryptography Setup for %%I\n"
"DefaultDependencies=no\n"
"BindTo=%s dev-mapper-%%i.device\n"
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
- "Before=dev-mapper-%%i.device shutdown.target local-fs.target\n",
+ "Before=dev-mapper-%%i.device shutdown.target cryptsetup.target\n",
d, d);
if (password && (streq(password, "/dev/urandom") ||
"\n[Service]\n"
"Type=oneshot\n"
"RemainAfterExit=yes\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);
- if (options && has_option(options, "tmp"))
+ if (has_option(options, "tmp"))
fprintf(f,
- "ExecStartPost=/sbin/mke2fs '%s'",
- u);
+ "ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n",
+ name);
- if (options && has_option(options, "swap"))
+ if (has_option(options, "swap"))
fprintf(f,
- "ExecStartPost=/sbin/mkswap '%s'",
- u);
+ "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
+ name);
fflush(f);
goto fail;
}
- if (!options || !has_option(options, "noauto")) {
+ if (!has_option(options, "noauto")) {
if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {
r = -ENOMEM;
r = -errno;
goto fail;
}
+
+ free(to);
+ to = NULL;
+
+ if (!has_option(options, "nofail")) {
+
+ if (asprintf(&to, "%s/cryptsetup.target.wants/%s", arg_dest, 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;
+ }
+ }
}
free(to);
to = NULL;
e = unit_name_escape(name);
- if (asprintf(&to, "%s/dev-mapper-%s.device.wants/%s", arg_dest, e, n) < 0) {
+ if (asprintf(&to, "%s/dev-mapper-%s.device.requires/%s", arg_dest, e, n) < 0) {
r = -ENOMEM;
goto fail;
}
return EXIT_FAILURE;
}
- arg_dest = argv[1];
+ if (argc > 1)
+ arg_dest = argv[1];
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();