chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'zbigniew/systemadm_changes'
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 660af131dc6312cbaaf891a6df0b99f22da8e893..f9cfe910a07c5195985ec8c46706fb6f680c6789 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-320,11
+320,14
@@
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) {
- const char *target, *after = NULL;
+ const char *target, *after = NULL
, *after2 = NULL
;
MountParameters *p;
Unit *tu;
int r;
MountParameters *p;
Unit *tu;
int r;
@@
-354,9
+357,12
@@
static int mount_add_fstab_links(Mount *m) {
if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET;
if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET;
- after = SPECIAL_NETWORK_TARGET;
- } else
+ after = SPECIAL_REMOTE_FS_PRE_TARGET;
+ after2 = SPECIAL_NETWORK_TARGET;
+ } else {
target = SPECIAL_LOCAL_FS_TARGET;
target = SPECIAL_LOCAL_FS_TARGET;
+ after = SPECIAL_LOCAL_FS_PRE_TARGET;
+ }
if (!path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
if (!path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
@@
-369,6
+375,10
@@
static int mount_add_fstab_links(Mount *m) {
if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
return r;
+ if (after2)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0)
+ return r;
+
if (automount) {
Unit *am;
if (automount) {
Unit *am;
@@
-791,6
+801,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
+1484,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;
@@
-1769,19
+1780,20
@@
static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes");
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes");
- return -E
INVAL
;
+ return -E
SRCH
;
}
if (m->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
}
if (m->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
- return -E
NOENT
;
+ return -E
SRCH
;
}
}
- if (m->control_pid > 0)
- if (kill(m->control_pid, signo) < 0)
- r = -errno;
+ if (who == KILL_CONTROL || who == KILL_ALL)
+ if (m->control_pid > 0)
+ if (kill(m->control_pid, signo) < 0)
+ r = -errno;
- if (mode == KILL_CONTROL_GROUP) {
+ if (
who == KILL_ALL &&
mode == KILL_CONTROL_GROUP) {
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
@@
-1795,7
+1807,7
@@
static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
}
if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
}
if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
- if (
r != -EAGAIN && r != -ESRCH && r
!= -ENOENT)
+ if (
q != -EAGAIN && q != -ESRCH && q
!= -ENOENT)
r = q;
}
r = q;
}
@@
-1834,6
+1846,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,