chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6a3ff9
)
mount: don't pull in nofail mounts by default, but use them if they are around
author
Lennart Poettering
<lennart@poettering.net>
Fri, 29 Oct 2010 04:05:02 +0000
(06:05 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 29 Oct 2010 14:28:30 +0000
(16:28 +0200)
src/mount.c
patch
|
blob
|
history
diff --git
a/src/mount.c
b/src/mount.c
index 2f966258267ff9f0925522138f76b64d62c8ddbf..781c7a8721f24172f36c2c5256b3a9eb3de9936e 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-265,7
+265,7
@@
static int mount_add_target_links(Mount *m) {
MountParameters *p;
Unit *tu;
int r;
MountParameters *p;
Unit *tu;
int r;
- bool noauto, handle, automount;
+ bool noauto,
nofail,
handle, automount;
assert(m);
assert(m);
@@
-277,6
+277,7
@@
static int mount_add_target_links(Mount *m) {
return 0;
noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO);
return 0;
noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO);
+ nofail = !!mount_test_option(p->options, "nofail");
handle = !!mount_test_option(p->options, "comment=systemd.mount") ||
m->meta.manager->mount_auto;
automount = !!mount_test_option(p->options, "comment=systemd.automount");
handle = !!mount_test_option(p->options, "comment=systemd.mount") ||
m->meta.manager->mount_auto;
automount = !!mount_test_option(p->options, "comment=systemd.automount");
@@
-309,6
+310,7
@@
static int mount_add_target_links(Mount *m) {
/* Automatically add mount points that aren't natively
* configured to local-fs.target */
if (!noauto &&
/* Automatically add mount points that aren't natively
* configured to local-fs.target */
if (!noauto &&
+ !nofail &&
handle &&
m->from_etc_fstab &&
m->meta.manager->running_as == MANAGER_SYSTEM)
handle &&
m->from_etc_fstab &&
m->meta.manager->running_as == MANAGER_SYSTEM)