summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--src/mount.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/TODO b/TODO
index fe516c5ee7..e6c2ee5677 100644
--- a/TODO
+++ b/TODO
@@ -26,8 +26,6 @@ F15:
* reload-or-try-restart man page blurb uses word "fail"
-* explicitly block creation of mount units for API file systems
-
Features:
* write blog stories about:
diff --git a/src/mount.c b/src/mount.c
index 2d8542d9df..49bfd079a6 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -476,6 +476,11 @@ static int mount_verify(Mount *m) {
return -EINVAL;
}
+ if (mount_point_is_api(m->where) || mount_point_ignore(m->where)) {
+ log_error("Cannot create mount unit for API file system %s. Refusing.", m->where);
+ return -EINVAL;
+ }
+
if (m->meta.fragment_path && !m->parameters_fragment.what) {
log_error("%s's What setting is missing. Refusing.", m->meta.id);
return -EBADMSG;
@@ -1300,9 +1305,7 @@ static int mount_add_one(
/* Ignore API mount points. They should never be referenced in
* dependencies ever. */
- if (mount_point_is_api(where))
- return 0;
- if (mount_point_ignore(where))
+ if (mount_point_is_api(where) || mount_point_ignore(where))
return 0;
if (streq(fstype, "autofs"))