chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: replace linked list by hashmap when merging files
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index d26d45f038843148f556a86609e1b997a3e8ed02..2fc799a6ed58cfc0a636fd6a80c6dea9759365ba 100644
(file)
--- 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") ||
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) {
}
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,
true,
m->meta.manager->confirm_spawn,
m->meta.cgroup_bondings,
+ m->meta.cgroup_attributes,
&pid)) < 0)
goto fail;
&pid)) < 0)
goto fail;
@@
-1473,7
+1477,7
@@
static int mount_find_pri(char *options) {
char *end, *pri;
unsigned long r;
char *end, *pri;
unsigned long r;
- if (!(pri = mount_test_option(options, "pri
=
")))
+ if (!(pri = mount_test_option(options, "pri")))
return 0;
pri += 4;
return 0;
pri += 4;
@@
-1835,6
+1839,10
@@
DEFINE_STRING_TABLE_LOOKUP(mount_exec_command, MountExecCommand);
const UnitVTable mount_vtable = {
.suffix = ".mount",
const UnitVTable mount_vtable = {
.suffix = ".mount",
+ .sections =
+ "Unit\0"
+ "Mount\0"
+ "Install\0",
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,