From 53b2695b96c6e8717a375cc2a17fcc4384d04790 Mon Sep 17 00:00:00 2001

From: Chris Leech <cleech@redhat.com>

Date: Sun, 23 Nov 2014 20:33:37 -0800

Subject: [PATCH] mount: use libmount to enumerate /proc/self/mountinfo

This lets libmount add in user options from /run/mount/utab, like

_netdev which is needed to get proper ordering against remote-fs.target

Conflicts:

	Makefile.am

	README

	configure.ac

	src/core/mount.c

(cherry-picked from 8d3ae2bd4c9bf9fc2e57f7b3776325a1c750ca30)

Related: #1161417

---

 .travis.yml      |  2 +-

 Makefile.am      |  4 +++-

 README           |  1 +

 configure.ac     | 10 +++++++++

 src/core/mount.c | 65 ++++++++++++++++++++++++++------------------------------

 5 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml

index 7e5251c..4ea2bc2 100644

--- a/.travis.yml

+++ b/.travis.yml

@@ -3,7 +3,7 @@ compiler:

   - gcc

 before_install:

  - sudo apt-get update -qq

- - sudo apt-get install autotools-dev automake autoconf libtool libdbus-1-dev libcap-dev libblkid-dev libpam-dev libcryptsetup-dev libaudit-dev libacl1-dev libattr1-dev libselinux-dev liblzma-dev libgcrypt-dev libqrencode-dev libmicrohttpd-dev gtk-doc-tools gperf python2.7-dev

+ - sudo apt-get install autotools-dev automake autoconf libtool libdbus-1-dev libcap-dev libblkid-dev libmount-dev libpam-dev libcryptsetup-dev libaudit-dev libacl1-dev libattr1-dev libselinux-dev liblzma-dev libgcrypt-dev libqrencode-dev libmicrohttpd-dev gtk-doc-tools gperf python2.7-dev

 script: ./autogen.sh && ./configure --enable-gtk-doc --enable-gtk-doc-pdf && make V=1 && sudo ./systemd-machine-id-setup && make check && make distcheck

 after_failure: cat test-suite.log

 notifications:

diff --git a/Makefile.am b/Makefile.am

index faf2a32..0891bca 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -997,6 +997,7 @@ libsystemd_core_la_CFLAGS = \

 	$(PAM_CFLAGS) \

 	$(AUDIT_CFLAGS) \

 	$(KMOD_CFLAGS) \

+	$(MOUNT_CFLAGS) \

 	-pthread

 libsystemd_core_la_LIBADD = \

@@ -1013,7 +1014,8 @@ libsystemd_core_la_LIBADD = \

 	$(PAM_LIBS) \

 	$(AUDIT_LIBS) \

 	$(CAP_LIBS) \

-	$(KMOD_LIBS)

+	$(KMOD_LIBS) \

+	$(MOUNT_LIBS)

 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf

 	$(AM_V_at)$(MKDIR_P) $(dir $@)

diff --git a/README b/README

index b39cd37..42487dd 100644

--- a/README

+++ b/README

@@ -94,6 +94,7 @@ REQUIREMENTS:

         dbus >= 1.4.0

         libcap

+        libmount >= 2.20 (from util-linux)

         libblkid >= 2.20 (from util-linux) (optional)

         libkmod >= 14 (optional)

         PAM >= 1.1.2 (optional)

diff --git a/configure.ac b/configure.ac

index 4f26092..b7dfc5f 100644

--- a/configure.ac

+++ b/configure.ac

@@ -292,6 +292,15 @@ fi

 AM_CONDITIONAL(HAVE_BLKID, [test "$have_blkid" = "yes"])

 # ------------------------------------------------------------------------------

+have_libmount=no

+PKG_CHECK_MODULES(MOUNT, [ mount >= 2.20 ],

+        [AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available]) have_libmount=yes], have_libmount=no)

+if test "x$have_libmount" = xno; then

+        AC_MSG_ERROR([*** libmount support required but libraries not found])

+fi

+AM_CONDITIONAL(HAVE_LIBMOUNT, [test "$have_libmount" = "yes"])

+

+# ------------------------------------------------------------------------------

 have_ima=yes

 AC_ARG_ENABLE([ima], AS_HELP_STRING([--disable-ima],[Disable optional IMA support]),

                 [case "${enableval}" in

@@ -1046,6 +1055,7 @@ AC_MSG_RESULT([

         efi:                     ${have_efi}

         kmod:                    ${have_kmod}

         blkid:                   ${have_blkid}

+        libmount:                ${have_libmount}

         nss-myhostname:          ${have_myhostname}

         gudev:                   ${enable_gudev}

         gintrospection:          ${enable_introspection}

diff --git a/src/core/mount.c b/src/core/mount.c

index bbceb92..d78269c 100644

--- a/src/core/mount.c

+++ b/src/core/mount.c

@@ -24,6 +24,7 @@

 #include <mntent.h>

 #include <sys/epoll.h>

 #include <signal.h>

+#include <libmount.h>

 #include "manager.h"

 #include "unit.h"

@@ -1563,55 +1564,47 @@ fail:

         return r;

 }

+static inline void mnt_free_table_p(struct libmnt_table **tb) {

+        mnt_free_table(*tb);

+}

+

+static inline void mnt_free_iter_p(struct libmnt_iter **itr) {

+        mnt_free_iter(*itr);

+}

+

 static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {

+        _cleanup_(mnt_free_table_p) struct libmnt_table *tb = NULL;

+        _cleanup_(mnt_free_iter_p) struct libmnt_iter *itr = NULL;

+        struct libmnt_fs *fs;

         int r = 0;

-        unsigned i;

         assert(m);

-        rewind(m->proc_self_mountinfo);

+        tb = mnt_new_table();

+        itr = mnt_new_iter(MNT_ITER_FORWARD);

+        if (!tb || !itr)

+                return log_oom();

-        for (i = 1;; i++) {

-                _cleanup_free_ char *device = NULL, *path = NULL, *options = NULL, *options2 = NULL, *fstype = NULL, *d = NULL, *p = NULL, *o = NULL;

-                int k;

+        mnt_table_parse_mtab(tb, NULL);

+        if (r)

+                return r;

-                k = fscanf(m->proc_self_mountinfo,

-                           "%*s "       /* (1) mount id */

-                           "%*s "       /* (2) parent id */

-                           "%*s "       /* (3) major:minor */

-                           "%*s "       /* (4) root */

-                           "%ms "       /* (5) mount point */

-                           "%ms"        /* (6) mount options */

-                           "%*[^-]"     /* (7) optional fields */

-                           "- "         /* (8) separator */

-                           "%ms "       /* (9) file system type */

-                           "%ms"        /* (10) mount source */

-                           "%ms"        /* (11) mount options 2 */

-                           "%*[^\n]",   /* some rubbish at the end */

-                           &path,

-                           &options,

-                           &fstype,

-                           &device,

-                           &options2);

-

-                if (k == EOF)

-                        break;

-

-                if (k != 5) {

-                        log_warning("Failed to parse /proc/self/mountinfo:%u.", i);

-                        continue;

-                }

+        while (mnt_table_next_fs(tb, itr, &fs) == 0) {

+                const char *device, *path, *options, *fstype;

+                _cleanup_free_ const char *d = NULL, *p = NULL;

+                int k;

-                o = strjoin(options, ",", options2, NULL);

-                if (!o)

-                        return log_oom();

+                device = mnt_fs_get_source(fs);

+                path = mnt_fs_get_target(fs);

+                options = mnt_fs_get_options(fs);

+                fstype = mnt_fs_get_fstype(fs);

                 d = cunescape(device);

                 p = cunescape(path);

                 if (!d || !p)

                         return log_oom();

-                k = mount_add_one(m, d, p, o, fstype, 0, set_flags);

+                k = mount_add_one(m, d, p, options, fstype, 0, set_flags);

                 if (k < 0)

                         r = k;

         }

@@ -1632,6 +1625,8 @@ static int mount_enumerate(Manager *m) {

         int r;

         assert(m);

+        mnt_init_debug(0);

+

         if (!m->proc_self_mountinfo) {

                 struct epoll_event ev = {

                         .events = EPOLLPRI,