X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount.c;h=2fc799a6ed58cfc0a636fd6a80c6dea9759365ba;hb=260a2be45522f03ce8d8aca38e471d7b0882ff05;hp=d26d45f038843148f556a86609e1b997a3e8ed02;hpb=a17204af0e950be7a5199db62ef400814e29aa3c;p=elogind.git

diff --git a/src/mount.c b/src/mount.c
index d26d45f03..2fc799a6e 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -320,7 +320,10 @@ static bool needs_quota(MountParameters *p) {
                 return false;
 
         return mount_test_option(p->options, "usrquota") ||
-                mount_test_option(p->options, "grpquota");
+                mount_test_option(p->options, "grpquota") ||
+                mount_test_option(p->options, "quota") ||
+                mount_test_option(p->options, "usrjquota") ||
+                mount_test_option(p->options, "grpjquota");
 }
 
 static int mount_add_fstab_links(Mount *m) {
@@ -791,6 +794,7 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
                             true,
                             m->meta.manager->confirm_spawn,
                             m->meta.cgroup_bondings,
+                            m->meta.cgroup_attributes,
                             &pid)) < 0)
                 goto fail;
 
@@ -1473,7 +1477,7 @@ static int mount_find_pri(char *options) {
         char *end, *pri;
         unsigned long r;
 
-        if (!(pri = mount_test_option(options, "pri=")))
+        if (!(pri = mount_test_option(options, "pri")))
                 return 0;
 
         pri += 4;
@@ -1835,6 +1839,10 @@ DEFINE_STRING_TABLE_LOOKUP(mount_exec_command, MountExecCommand);
 
 const UnitVTable mount_vtable = {
         .suffix = ".mount",
+        .sections =
+                "Unit\0"
+                "Mount\0"
+                "Install\0",
 
         .no_alias = true,
         .no_instances = true,