summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-12 20:01:07 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-12 20:01:07 +0200
commit3d8dcaf1dad40c1287daa0a8a5fdf1ab8841d056 (patch)
tree00724c8edc17b2ce38b4457af04dedf55bfc9238 /src
parenteafe88e34a0698d2f4ebb747ab4911e35d0dfe4c (diff)
efi-boot-generator: need need to proceed if /boot is already a mount point
Diffstat (limited to 'src')
-rw-r--r--src/efi-boot-generator/efi-boot-generator.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
index 4842286e2e..94d733261a 100644
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -69,9 +69,13 @@ int main(int argc, char *argv[]) {
}
r = path_is_mount_point("/boot", true);
+ if (r > 0) {
+ log_debug("/boot is already a mount point, exiting.");
+ return EXIT_SUCCESS;
+ }
if (r == -ENOENT)
log_debug("/boot does not exist, continuing.");
- else if (r <= 0 && dir_is_empty("/boot") <= 0) {
+ else if (dir_is_empty("/boot") <= 0) {
log_debug("/boot already populated, exiting.");
return EXIT_SUCCESS;
}