strv: detect non-assignments in env blocks properly in env_append()

[elogind.git] / src / cryptsetup-generator.c

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 00f48009edd52be80c040c285022a49a71cb74f5..b57c0b742ab141f84990edd1ee6f3d1f6d5a6f50 100644 (file)
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -115,6 +115,7 @@ static int create_disk(
                 "\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),
@@ -122,12 +123,12 @@ static int create_disk(
 
         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,
-                        "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'",
+                        "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
                         name);
 
         fflush(f);