summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Borzenkov <arvidjaar@gmail.com>2015-06-03 20:50:59 +0300
committerAndrei Borzenkov <arvidjaar@gmail.com>2015-06-03 21:03:41 +0300
commitfa05e97257fc54b05e4c272dfc19cea46511b823 (patch)
tree315fa77770263a853d400a5eb0751c969315eaf7
parenteb71a33158ecae7f0ba8499bc4f3c674ceaebfd5 (diff)
fstab-generator: cescape device name in root-fsck service
We unescape ExecStart line when parsing it, so escape device name before adding it to unit file. fixes #50
-rw-r--r--src/shared/generator.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 807569a1b8..e58bbea77c 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -34,9 +34,14 @@
static int write_fsck_sysroot_service(const char *dir, const char *what) {
const char *unit;
_cleanup_free_ char *device = NULL;
+ _cleanup_free_ char *escaped;
_cleanup_fclose_ FILE *f = NULL;
int r;
+ escaped = cescape(what);
+ if (!escaped)
+ return log_oom();
+
unit = strjoina(dir, "/systemd-fsck-root.service");
log_debug("Creating %s", unit);
@@ -61,11 +66,12 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
"[Service]\n"
"Type=oneshot\n"
"RemainAfterExit=yes\n"
- "ExecStart=" SYSTEMD_FSCK_PATH " %2$s\n"
+ "ExecStart=" SYSTEMD_FSCK_PATH " %4$s\n"
"TimeoutSec=0\n",
program_invocation_short_name,
what,
- device);
+ device,
+ escaped);
r = fflush_and_check(f);
if (r < 0)