chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: introduce new --link-journal= switch to link container journals into host
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index 4166f365eaccef7dc451d117757b54a14a6cfc8e..d0984242c803c53b52670014c5ae04799a6b7862 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-81,14
+81,14
@@
static int create_disk(
noauto = has_option(options, "noauto");
nofail = has_option(options, "nofail");
noauto = has_option(options, "noauto");
nofail = has_option(options, "nofail");
- n = unit_name_
build_escap
e("systemd-cryptsetup", name, ".service");
+ n = unit_name_
from_path_instanc
e("systemd-cryptsetup", name, ".service");
if (!n) {
r = -ENOMEM;
log_error("Failed to allocate unit name.");
goto fail;
}
if (!n) {
r = -ENOMEM;
log_error("Failed to allocate unit name.");
goto fail;
}
- p = join(arg_dest, "/", n, NULL);
+ p =
str
join(arg_dest, "/", n, NULL);
if (!p) {
r = -ENOMEM;
log_error("Failed to allocate unit file name.");
if (!p) {
r = -ENOMEM;
log_error("Failed to allocate unit file name.");
@@
-120,10
+120,11
@@
static int create_disk(
"# Automatically generated by systemd-cryptsetup-generator\n\n"
"[Unit]\n"
"Description=Cryptography Setup for %%I\n"
"# 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"
"SourcePath=/etc/crypttab\n"
"Conflicts=umount.target\n"
"DefaultDependencies=no\n"
- "BindTo=%s dev-mapper-%%i.device\n"
+ "Bind
s
To=%s dev-mapper-%%i.device\n"
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
"Before=umount.target\n",
d, d);
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
"Before=umount.target\n",
d, d);
@@
-174,7
+175,7
@@
static int create_disk(
if (!noauto) {
if (!noauto) {
- to = join(arg_dest, "/", d, ".wants/", n, NULL);
+ to =
str
join(arg_dest, "/", d, ".wants/", n, NULL);
if (!to) {
r = -ENOMEM;
goto fail;
if (!to) {
r = -ENOMEM;
goto fail;
@@
-190,9
+191,9
@@
static int create_disk(
free(to);
if (!nofail)
free(to);
if (!nofail)
- to = join(arg_dest, "/cryptsetup.target.requires/", n, NULL);
+ to =
str
join(arg_dest, "/cryptsetup.target.requires/", n, NULL);
else
else
- to = join(arg_dest, "/cryptsetup.target.wants/", n, NULL);
+ to =
str
join(arg_dest, "/cryptsetup.target.wants/", n, NULL);
if (!to) {
r = -ENOMEM;
goto fail;
if (!to) {
r = -ENOMEM;
goto fail;
@@
-210,7
+211,7
@@
static int create_disk(
}
e = unit_name_escape(name);
}
e = unit_name_escape(name);
- to = join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
+ to =
str
join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
if (!to) {
r = -ENOMEM;
goto fail;
if (!to) {
r = -ENOMEM;
goto fail;