summaryrefslogtreecommitdiff
path: root/src/core/manager.c
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2015-06-01 13:48:01 +0200
committerKarel Zak <kzak@redhat.com>2015-09-14 09:12:31 +0200
commitd379d44255469f03994832ab5821bf1b9034f4dc (patch)
tree27194587d38c4ea1333e67caed64202ecca9ec20 /src/core/manager.c
parent5669ef3644e3044036eeaaf6bb4b1a6a7e63130c (diff)
mount: use libmount to monitor mountinfo & utab
The current implementation directly monitor /proc/self/mountinfo and /run/mount/utab files. It's really not optimal because utab file is private libmount stuff without any official guaranteed semantic. The libmount since v2.26 provides API to monitor mount kernel & userspace changes and since v2.27 the monitor is usable for non-root users too. This patch replaces the current implementation with libmount based solution. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'src/core/manager.c')
-rw-r--r--src/core/manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 8e518fbaaf..bb1009081a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -571,8 +571,8 @@ int manager_new(ManagerRunningAs running_as, bool test_run, Manager **_m) {
m->idle_pipe[0] = m->idle_pipe[1] = m->idle_pipe[2] = m->idle_pipe[3] = -1;
m->pin_cgroupfs_fd = m->notify_fd = m->signal_fd = m->time_change_fd =
- m->dev_autofs_fd = m->private_listen_fd = m->kdbus_fd = m->utab_inotify_fd =
- m->cgroup_inotify_fd = -1;
+ m->dev_autofs_fd = m->private_listen_fd = m->kdbus_fd = m->cgroup_inotify_fd = -1;
+
m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
m->ask_password_inotify_fd = -1;