gpt-auto-generator: check fstab for /boot entries

We need to prevent the creation of the gpt automount unit, which will not
get overridden by the fstab mount unit.

https://github.com/systemd/systemd/issues/1378

2 files changed, 18 insertions, 0 deletions

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index e231a0ff80..db2146f8c1 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -20,9 +20,26 @@
 ***/
 
 #include "fstab-util.h"
+#include "path-util.h"
 #include "strv.h"
 #include "util.h"
 
+bool fstab_is_mount_point(const char *mount) {
+        _cleanup_free_ char *device = NULL;
+        _cleanup_endmntent_ FILE *f = NULL;
+        struct mntent *m;
+
+        f = setmntent("/etc/fstab", "r");
+        if (!f)
+                return false;
+
+        while ((m = getmntent(f)))
+                if (path_equal(m->mnt_dir, mount))
+                        return true;
+
+        return false;
+}
+
 int fstab_filter_options(const char *opts, const char *names,
                          const char **namefound, char **value, char **filtered) {
         const char *name, *n = NULL, *x;
diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index 387c562a96..872b2363cd 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -25,6 +25,7 @@
 #include <stddef.h>
 #include "macro.h"
 
+bool fstab_is_mount_point(const char *mount);
 int fstab_filter_options(const char *opts, const char *names,
                          const char **namefound, char **value, char **filtered);