chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: never pull in sysinit from utmp, so that we can shutdown from emergency mode...
[elogind.git]
/
src
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup-generator.c
b/src/cryptsetup-generator.c
index 00120f67a0a63fa6739a9217f222ca8e49116c06..9b62e6a6d3c62ccf3f9fece7cd203c64eeebca11 100644
(file)
--- a/
src/cryptsetup-generator.c
+++ b/
src/cryptsetup-generator.c
@@
-122,12
+122,12
@@
static int create_disk(
if (options && has_option(options, "tmp"))
fprintf(f,
if (options && has_option(options, "tmp"))
fprintf(f,
- "ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'",
+ "ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'
\n
",
name);
if (options && has_option(options, "swap"))
fprintf(f,
name);
if (options && has_option(options, "swap"))
fprintf(f,
- "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'",
+ "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'
\n
",
name);
fflush(f);
name);
fflush(f);
@@
-222,7
+222,8
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
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();
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();