chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generators: make automatic discovery generators work correctly when reloading
[elogind.git]
/
src
/
efi-boot-generator
/
efi-boot-generator.c
diff --git
a/src/efi-boot-generator/efi-boot-generator.c
b/src/efi-boot-generator/efi-boot-generator.c
index cf9ff73b12d55c67ccd6f4fcf15f2cb834d1f3b6..66d85bd204adad644e80c6f1763774941e3a50b4 100644
(file)
--- 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;
}
log_debug("In initrd, exiting.");
return EXIT_SUCCESS;
}
+
if (detect_container(NULL) > 0) {
log_debug("In a container, 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;
}
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;
}
log_debug("/boot already populated, exiting.");
return EXIT_SUCCESS;
}