diff options
author | Franck Bui <fbui@suse.com> | 2015-11-25 21:21:44 +0100 |
---|---|---|
committer | Franck Bui <fbui@suse.com> | 2015-11-25 21:21:44 +0100 |
commit | 0d3d3be1e225d51ebf46fb40a89419eb6a7d334e (patch) | |
tree | ba35447830b437ccf03f70d0fccdd187ba0fe5af | |
parent | ac7653a43314aed75ba6d9516cd596000a7355f9 (diff) |
fstab-gen: post can't be NULL
-rw-r--r-- | src/fstab-generator/fstab-generator.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index f7c8d11ace..87b8b77f22 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -248,6 +248,7 @@ static int add_mount( assert(what); assert(where); assert(opts); + assert(post); assert(source); if (streq_ptr(fstype, "autofs")) @@ -297,7 +298,7 @@ static int add_mount( "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n", source); - if (post && !noauto && !nofail && !automount) + if (!noauto && !nofail && !automount) fprintf(f, "Before=%s\n", post); if (!automount && opts) { @@ -337,7 +338,7 @@ static int add_mount( if (r < 0) return log_error_errno(r, "Failed to write unit file %s: %m", unit); - if (!noauto && post) { + if (!noauto) { lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); if (!lnk) return log_oom(); @@ -368,10 +369,7 @@ static int add_mount( "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n", source); - if (post) - fprintf(f, - "Before=%s\n", - post); + fprintf(f, "Before=%s\n", post); if (opts) { r = write_requires_after(f, opts); |