From e7d04aaea0b66df1bdbd303580c7a6125b7071d1 Mon Sep 17 00:00:00 2001 From: David Ward Date: Fri, 4 May 2012 00:50:15 +0200 Subject: [PATCH] utmp: support non-rootfs configuration Having a rootfs is not a necessary condition for monitoring utmp, since /var or /var/run can just be remounted inside the container instead. We should rely on the other two conditions already in place to decide whether to monitor the utmp file: - the container was started with 'lxc-start', which indicates that it has a real init process and is expected to write to a utmp file - support for CAP_SYS_BOOT was not found in the kernel, which would otherwise supersede utmp monitoring Signed-off-by: David Ward Signed-off-by: Daniel Lezcano --- src/lxc/utmp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/lxc/utmp.c b/src/lxc/utmp.c index b6469b09a..a7b9b525d 100644 --- a/src/lxc/utmp.c +++ b/src/lxc/utmp.c @@ -233,10 +233,6 @@ int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr, char path2[MAXPATHLEN]; int fd, wd; struct lxc_utmp *utmp_data; - struct lxc_conf *conf = handler->conf; - - if (!conf->rootfs.path) - return 0; /* We set up a watch for the /var/run directory. We're only interested * in utmp at the moment, but want to watch for delete and create