picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mount: block creation of mount units for API file systems

This commit is contained in:
Lennart Poettering 2011-04-05 23:39:21 +02:00
parent 33bd08a97a
commit 33ff02c9fe
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -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:

9
src/mount.c
View File

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