efi-boot-generator: hookup to fsck

diff --git a/TODO b/TODO
index f0060d957f028246727b346ec896a2efac951ee3..814d82d771811f82ca3f2339517629627cb7c19d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -308,7 +308,6 @@ Features:
 * introduce ExecCondition= in services
 
 * EFI:
-  - fsck hookup for the ESP mount is missing
   - write man page for efi boot generator
   - honor language efi variables for default language selection (if there are any?)
   - honor timezone efi variables for default timezone selection (if there are any?)

diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
index 05b95ed455180438c3104c3597e16a27e74de226..e20d3250b836b8bc5fdf52bda3908033757bc787 100644 (file)
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -26,13 +26,14 @@
 #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_free_ char *name = NULL, *what = NULL, *fsck = NULL;
         _cleanup_fclose_ FILE *f = NULL;
 
         if (argc > 1 && argc != 4) {
@@ -75,15 +76,32 @@ int main(int argc, char *argv[]) {
                 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;
+        }
+
+        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"
+                "What=%s\n"
                 "Options=umask=0077\n",
-                SD_ID128_FORMAT_VAL(id));
+                fsck, fsck, what);
 
         free(name);
         name = strjoin(arg_dest, "/boot.automount", NULL);