#include "path-util.h"
#include "util.h"
#include "mkdir.h"
+#include "unit-name.h"
static const char *arg_dest = "/tmp";
int main(int argc, char *argv[]) {
int r = EXIT_SUCCESS;
sd_id128_t id;
- _cleanup_free_ char *name = NULL;
- _cleanup_fclose_ FILE *f = NULL;
+ _cleanup_free_ char *what = NULL, *fsck = NULL;
+ char *name;
+ _cleanup_fclose_ FILE *f = NULL, *f2 = NULL;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
return EXIT_FAILURE;
}
- name = strjoin(arg_dest, "/boot.mount", NULL);
- if (!name) {
+ name = strappenda(arg_dest, "/boot.mount");
+ f = fopen(name, "wxe");
+ if (!f) {
+ log_error("Failed to create mount unit file %s: %m", name);
+ return EXIT_FAILURE;
+ }
+
+ r = asprintf(&what,
+ "/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+ SD_ID128_FORMAT_VAL(id));
+ if (r < 0) {
log_oom();
return EXIT_FAILURE;
}
- f = fopen(name, "wxe");
- if (!f) {
- log_error("Failed to create mount unit file %s: %m", name);
+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
+ if (!fsck) {
+ log_oom();
return EXIT_FAILURE;
}
fprintf(f,
"# Automatially generated by systemd-efi-boot-generator\n\n"
"[Unit]\n"
- "Description=EFI System Partition\n\n"
+ "Description=EFI System Partition\n"
+ "Requires=%s\n"
+ "After=%s\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"
- "Options=umask=0077\n",
- SD_ID128_FORMAT_VAL(id));
+ "What=%s\n"
+ "Options=umask=0077,noauto\n",
+ fsck, fsck, what);
- free(name);
- name = strjoin(arg_dest, "/boot.automount", NULL);
- if (!name) {
- log_oom();
- return EXIT_FAILURE;
- }
-
- fclose(f);
- f = fopen(name, "wxe");
- if (!f) {
+ name = strappenda(arg_dest, "/boot.automount");
+ f2 = fopen(name, "wxe");
+ if (!f2) {
log_error("Failed to create automount unit file %s: %m", name);
return EXIT_FAILURE;
}
"[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);
- if (!name) {
- log_oom();
- return EXIT_FAILURE;
- }
+ "Where=/boot\n", f2);
+ name = strappenda(arg_dest, "/local-fs.target.wants/boot.automount");
mkdir_parents(name, 0755);
if (symlink("../boot.automount", name) < 0) {
return EXIT_FAILURE;
}
- return 0;
+ return EXIT_SUCCESS;
}