chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: bind mount /etc/localtime
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 102d88b6e068846577f8b628613606fd837967a2..00780101a0c1edbced14f97a2ce6c0371416a33f 100644
(file)
--- 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");
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;
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))) {
if (mount_test_option(p->options, "_netdev") ||
(p->fstype && fstype_is_network(p->fstype))) {
@@
-306,7
+310,7
@@
static int mount_add_target_links(Mount *m) {
return r;
if (after)
return r;
if (after)
- if ((r = unit_add_dependency_by_name(
tu
, UNIT_AFTER, after, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(
UNIT(m)
, UNIT_AFTER, after, NULL, true)) < 0)
return r;
if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) {
return r;
if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) {
@@
-729,9
+733,9
@@
static void mount_enter_signal(Mount *m, MountState state, bool success) {
state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL;
if (m->control_pid > 0) {
state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL;
if (m->control_pid > 0) {
- if (kill(m->exec_context.kill_mode == KILL_PROCESS_GROUP ?
- -m->control_pid :
- m->control_pid, sig) < 0 && errno != ESRCH)
+ if (kill
_and_sigcont
(m->exec_context.kill_mode == KILL_PROCESS_GROUP ?
+
-m->control_pid :
+
m->control_pid, sig) < 0 && errno != ESRCH)
log_warning("Failed to kill control process %li: %m", (long) m->control_pid);
else
log_warning("Failed to kill control process %li: %m", (long) m->control_pid);
else
@@
-750,7
+754,7
@@
static void mount_enter_signal(Mount *m, MountState state, bool success) {
if ((r = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0)
goto fail;
if ((r = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0)
goto fail;
- if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig, pid_set)) < 0) {
+ if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig,
true,
pid_set)) < 0) {
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
log_warning("Failed to kill control group: %s", strerror(-r));
} else if (r > 0)
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
log_warning("Failed to kill control group: %s", strerror(-r));
} else if (r > 0)
@@
-1678,7
+1682,7
@@
static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
goto finish;
}
goto finish;
}
- if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, 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)
r = q;
}
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
r = q;
}