chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsckd: free client event source before we close its fd
[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 52d00c0443e225fad58cf5c3736a2a06dfa7852f..58c4cc278a2da38d0a5af5e1b5bdc3f283ffc7ea 100644
(file)
--- a/
src/efi-boot-generator/efi-boot-generator.c
+++ b/
src/efi-boot-generator/efi-boot-generator.c
@@
-26,7
+26,6
@@
#include "path-util.h"
#include "util.h"
#include "mkdir.h"
#include "path-util.h"
#include "util.h"
#include "mkdir.h"
-#include "unit-name.h"
#include "virt.h"
#include "generator.h"
#include "special.h"
#include "virt.h"
#include "generator.h"
#include "special.h"
@@
-80,14
+79,14
@@
int main(int argc, char *argv[]) {
log_debug("EFI loader partition unknown, exiting.");
return EXIT_SUCCESS;
} else if (r < 0) {
log_debug("EFI loader partition unknown, exiting.");
return EXIT_SUCCESS;
} else if (r < 0) {
- log_error_errno(
-
r, "Failed to read ESP partition UUID: %m");
+ log_error_errno(r, "Failed to read ESP partition UUID: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- name = str
append
a(arg_dest, "/boot.mount");
+ name = str
join
a(arg_dest, "/boot.mount");
f = fopen(name, "wxe");
if (!f) {
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;
}
@@
-120,15
+119,15
@@
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;
}
- name = str
append
a(arg_dest, "/boot.automount");
+ name = str
join
a(arg_dest, "/boot.automount");
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;
}
@@
-140,15
+139,15
@@
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;
}
- name = str
append
a(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
+ name = str
join
a(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
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;
}