diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-08 03:08:15 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-08 03:08:15 +0100 |
| commit | d4a7e06dea271fb38bfbca0090654f54cfb37992 (patch) | |
| tree | 4fba9af53afbafaa3b4118282707083254ff721a /src | |
| parent | 267632f0ab26bbcec6bc93682cf43d0f983c41d8 (diff) | |
mount: support less cumbersome x-systemd-xxx mount options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mount.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mount.c b/src/mount.c index 8a9ab16721..00780101a0 100644 --- a/src/mount.c +++ b/src/mount.c @@ -289,9 +289,13 @@ static int mount_add_target_links(Mount *m) { noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); nofail = !!mount_test_option(p->options, "nofail"); - handle = !!mount_test_option(p->options, "comment=systemd.mount") || + handle = + mount_test_option(p->options, "comment=systemd.mount") || + mount_test_option(p->options, "x-systemd-mount") || m->meta.manager->mount_auto; - automount = !!mount_test_option(p->options, "comment=systemd.automount"); + automount = + mount_test_option(p->options, "comment=systemd.automount") || + mount_test_option(p->options, "x-systemd-automount"); if (mount_test_option(p->options, "_netdev") || (p->fstype && fstype_is_network(p->fstype))) { |