From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Mar 2011 02:08:15 +0000 (+0100)
Subject: mount: support less cumbersome x-systemd-xxx mount options
X-Git-Tag: v20~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=d4a7e06dea271fb38bfbca0090654f54cfb37992;p=elogind.git

mount: support less cumbersome x-systemd-xxx mount options
---

diff --git a/src/mount.c b/src/mount.c
index 8a9ab1672..00780101a 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))) {