From 3d8dcaf1dad40c1287daa0a8a5fdf1ab8841d056 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 12 Apr 2015 20:01:07 +0200 Subject: efi-boot-generator: need need to proceed if /boot is already a mount point --- src/efi-boot-generator/efi-boot-generator.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/efi-boot-generator') 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; } -- cgit v1.2.3-54-g00ecf