chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: introduce session-devices
[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 c7bf34a5326fd951211e8ae41e626cc1c4b818b0..4367c536b0ca7e371e6a80887c5b9cff7bd480fe 100644
(file)
--- a/
src/efi-boot-generator/efi-boot-generator.c
+++ b/
src/efi-boot-generator/efi-boot-generator.c
@@
-49,7
+49,7
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if (!is_efiboot())
+ if (!is_efi
_
boot())
return EXIT_SUCCESS;
if (dir_is_empty("/boot") <= 0)
return EXIT_SUCCESS;
if (dir_is_empty("/boot") <= 0)
@@
-77,6
+77,8
@@
int main(int argc, char *argv[]) {
fprintf(f,
"# Automatially generated by systemd-efi-boot-generator\n\n"
fprintf(f,
"# Automatially generated by systemd-efi-boot-generator\n\n"
+ "[Unit]\n"
+ "Description=EFI System Partition\n\n"
"[Mount]\n"
"Where=/boot\n"
"What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
"[Mount]\n"
"Where=/boot\n"
"What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
@@
-97,10
+99,11
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- fprintf(f,
- "# Automatially generated by systemd-efi-boot-generator\n\n"
- "[Automount]\n"
- "Where=/boot\n");
+ fputs("# Automatially generated by systemd-efi-boot-generator\n\n"
+ "[Unit]\n"
+ "Description=EFI System Partition Automount\n\n"
+ "[Automount]\n"
+ "Where=/boot\n", f);
free(name);
name = strjoin(arg_dest, "/local-fs.target.wants/boot.automount", NULL);
free(name);
name = strjoin(arg_dest, "/local-fs.target.wants/boot.automount", NULL);
@@
-112,7
+115,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
: %m"
);
+ log_error("Failed to create symlink
%s: %m", name
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}