summaryrefslogtreecommitdiff
path: root/src/gpt-auto-generator/gpt-auto-generator.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-09-30 22:24:52 +0200
committerKay Sievers <kay@vrfy.org>2015-09-30 22:24:52 +0200
commit0b6b6787e3f0ae8906ce0212bd629edbe931b73d (patch)
treebe369ade314597718c186461b38ebe26fee06d1c /src/gpt-auto-generator/gpt-auto-generator.c
parenta19c7a4a4b773e25671a5fa874e7c421685d1bde (diff)
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
Diffstat (limited to 'src/gpt-auto-generator/gpt-auto-generator.c')
-rw-r--r--src/gpt-auto-generator/gpt-auto-generator.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index bb821797f1..dbb6648daa 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -38,6 +38,7 @@
#include "gpt.h"
#include "fileio.h"
#include "efivars.h"
+#include "fstab-util.h"
#include "blkid-util.h"
#include "btrfs-util.h"
@@ -465,6 +466,12 @@ static int add_boot(const char *what) {
return 0;
}
+ /* We create an .automount which is not overridden by the .mount from the fstab generator. */
+ if (fstab_is_mount_point("/boot")) {
+ log_debug("/boot specified in fstab, ignoring.");
+ return 0;
+ }
+
if (path_is_busy("/boot")) {
log_debug("/boot already populated, ignoring.");
return 0;