Skip to content

L
lxc
Commit 69182a31 by Serge Hallyn Committed by Daniel Lezcano
Options

do check for utmp checking at the right time

We were doing the check for whether we need to watch utmp from a thread cloned from that which will actually do the utmp watching. As a result, the utmp file was always being watched, even if it didn't need to be. Move the check to the parent thread. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/948623Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@canonical.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent f9d0d2cb
Showing with 9 additions and 5 deletions
src/lxc/start.c
...@@ -503,16 +503,12 @@ static int do_start(void *data) ...@@ -503,16 +503,12 @@ static int do_start(void *data)
if (lxc_sync_barrier_parent(handler, LXC_SYNC_CONFIGURE)) if (lxc_sync_barrier_parent(handler, LXC_SYNC_CONFIGURE))
return -1; return -1;
if (must_drop_cap_sys_boot()) { if (handler->conf->need_utmp_watch) {
if (prctl(PR_CAPBSET_DROP, CAP_SYS_BOOT, 0, 0, 0)) { if (prctl(PR_CAPBSET_DROP, CAP_SYS_BOOT, 0, 0, 0)) {
SYSERROR("failed to remove CAP_SYS_BOOT capability"); SYSERROR("failed to remove CAP_SYS_BOOT capability");
return -1; return -1;
} }
handler->conf->need_utmp_watch = 1;
DEBUG("Dropped cap_sys_boot\n"); DEBUG("Dropped cap_sys_boot\n");
} else {
DEBUG("Not dropping cap_sys_boot or watching utmp\n");
handler->conf->need_utmp_watch = 0;
} }
/* Setup the container, ip, names, utsname, ... */ /* Setup the container, ip, names, utsname, ... */
...@@ -635,6 +631,14 @@ int __lxc_start(const char *name, struct lxc_conf *conf, ...@@ -635,6 +631,14 @@ int __lxc_start(const char *name, struct lxc_conf *conf,
handler->ops = ops; handler->ops = ops;
handler->data = data; handler->data = data;
if (must_drop_cap_sys_boot()) {
handler->conf->need_utmp_watch = 1;
DEBUG("Dropping cap_sys_boot and watching utmp\n");
} else {
DEBUG("Not dropping cap_sys_boot or watching utmp\n");
handler->conf->need_utmp_watch = 0;
}
err = lxc_spawn(handler); err = lxc_spawn(handler);
if (err) { if (err) {
ERROR("failed to spawn '%s'", name); ERROR("failed to spawn '%s'", name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment