From 6d26dfe11c853d612b84abe858520bbcb62c2e96 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Mar 2014 18:26:35 +0100 Subject: generators: make automatic discovery generators work correctly when reloading In addition to checking whether the diestination mount point is populated, check whether it is already a mount point. If it is already a mount point, or if it is unpopulated, let's create the unit. --- src/efi-boot-generator/efi-boot-generator.c | 4 +++- 1 file changed, 3 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 cf9ff73b1..66d85bd20 100644 --- a/src/efi-boot-generator/efi-boot-generator.c +++ b/src/efi-boot-generator/efi-boot-generator.c @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { log_debug("In initrd, exiting."); return EXIT_SUCCESS; } + if (detect_container(NULL) > 0) { log_debug("In a container, exiting."); return EXIT_SUCCESS; @@ -68,7 +69,8 @@ int main(int argc, char *argv[]) { return EXIT_SUCCESS; } - if (dir_is_empty("/boot") <= 0) { + if (path_is_mount_point("/boot", true) <= 0 && + dir_is_empty("/boot") <= 0) { log_debug("/boot already populated, exiting."); return EXIT_SUCCESS; } -- cgit v1.2.3