chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rename unit_destroy_cgroup() to unit_destroy_cgroup_if_empty() since it's not...
[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 270dc226ef7c5016f2efd63176804bc5de729422..99a819fe37c3e2f0319f89fe2a0845891c19b053 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,24
+69,25
@@
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;
}
r = efi_loader_get_device_part_uuid(&id);
if (r == -ENOENT) {
log_debug("/boot already populated, exiting.");
return EXIT_SUCCESS;
}
r = efi_loader_get_device_part_uuid(&id);
if (r == -ENOENT) {
- log_debug("EFI loader partition unknown exiting.");
+ log_debug("EFI loader partition unknown
,
exiting.");
return EXIT_SUCCESS;
} else if (r < 0) {
return EXIT_SUCCESS;
} else if (r < 0) {
- log_error
("Failed to read ESP partition UUID: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to read ESP partition UUID: %m"
);
return EXIT_FAILURE;
}
name = strappenda(arg_dest, "/boot.mount");
f = fopen(name, "wxe");
if (!f) {
return EXIT_FAILURE;
}
name = strappenda(arg_dest, "/boot.mount");
f = fopen(name, "wxe");
if (!f) {
- log_error
(
"Failed to create mount unit file %s: %m", name);
+ log_error
_errno(errno,
"Failed to create mount unit file %s: %m", name);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-100,7
+102,8
@@
int main(int argc, char *argv[]) {
fprintf(f,
"# Automatially generated by systemd-efi-boot-generator\n\n"
"[Unit]\n"
fprintf(f,
"# Automatially generated by systemd-efi-boot-generator\n\n"
"[Unit]\n"
- "Description=EFI System Partition\n");
+ "Description=EFI System Partition\n"
+ "Documentation=man:systemd-efi-boot-generator(8)\n");
r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat");
if (r < 0)
r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat");
if (r < 0)
@@
-117,7
+120,7
@@
int main(int argc, char *argv[]) {
fflush(f);
if (ferror(f)) {
fflush(f);
if (ferror(f)) {
- log_error
(
"Failed to write mount unit file: %m");
+ log_error
_errno(errno,
"Failed to write mount unit file: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-125,7
+128,7
@@
int main(int argc, char *argv[]) {
fclose(f);
f = fopen(name, "wxe");
if (!f) {
fclose(f);
f = fopen(name, "wxe");
if (!f) {
- log_error
(
"Failed to create automount unit file %s: %m", name);
+ log_error
_errno(errno,
"Failed to create automount unit file %s: %m", name);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-137,7
+140,7
@@
int main(int argc, char *argv[]) {
fflush(f);
if (ferror(f)) {
fflush(f);
if (ferror(f)) {
- log_error
(
"Failed to write automount unit file: %m");
+ log_error
_errno(errno,
"Failed to write automount unit file: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-145,7
+148,7
@@
int main(int argc, char *argv[]) {
mkdir_parents(name, 0755);
if (symlink("../boot.automount", name) < 0) {
mkdir_parents(name, 0755);
if (symlink("../boot.automount", name) < 0) {
- log_error
(
"Failed to create symlink %s: %m", name);
+ log_error
_errno(errno,
"Failed to create symlink %s: %m", name);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}