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 <david.ward@ll.mit.edu>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
David Ward 2012-05-04 00:50:15 +02:00 committed by Daniel Lezcano
parent f51db2b39a
commit e7d04aaea0

View File

@ -233,10 +233,6 @@ int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr,
char path2[MAXPATHLEN]; char path2[MAXPATHLEN];
int fd, wd; int fd, wd;
struct lxc_utmp *utmp_data; 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 /* 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 * in utmp at the moment, but want to watch for delete and create