morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'pr/2036^^'

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-11-26 21:24:08 -05:00
parent 90c739259f 0d3d3be1e2
commit e0d8c8015a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fstab-generator/fstab-generator.c
View File

@@ -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);