pld-boot_efi_mount.patch

   1 diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c systemd-218/src/efi-boot-generator/efi-boot-generator.c
   2 --- systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c        2014-12-05 01:26:51.000000000 +0100
   3 +++ systemd-218/src/efi-boot-generator/efi-boot-generator.c     2015-04-02 15:45:18.000000000 +0200
   4 @@ -69,9 +69,9 @@
   5                  return EXIT_SUCCESS;
   6          }
   7
   8 -        if (path_is_mount_point("/boot", true) <= 0 &&
   9 -            dir_is_empty("/boot") <= 0) {
  10 -                log_debug("/boot already populated, exiting.");
  11 +        if (path_is_mount_point("/boot/efi", true) <= 0 &&
  12 +            dir_is_empty("/boot/efi") <= 0) {
  13 +                log_debug("/boot/efi already populated, exiting.");
  14                  return EXIT_SUCCESS;
  15          }
  16
  17 @@ -84,7 +84,7 @@
  18                  return EXIT_FAILURE;
  19          }
  20
  21 -        name = strjoina(arg_dest, "/boot.mount");
  22 +        name = strjoina(arg_dest, "/boot-efi.mount");
  23          f = fopen(name, "wxe");
  24          if (!f) {
  25                  log_error_errno(errno, "Failed to create mount unit file %s: %m", name);
  26 @@ -105,7 +105,7 @@
  27                  "Description=EFI System Partition\n"
  28                  "Documentation=man:systemd-efi-boot-generator(8)\n");
  29
  30 -        r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat");
  31 +        r = generator_write_fsck_deps(f, arg_dest, what, "/boot/efi", "vfat");
  32          if (r < 0)
  33                  return EXIT_FAILURE;
  34
  35 @@ -113,7 +113,7 @@
  36                  "\n"
  37                  "[Mount]\n"
  38                  "What=%s\n"
  39 -                "Where=/boot\n"
  40 +                "Where=/boot/efi\n"
  41                  "Type=vfat\n"
  42                  "Options=umask=0077,noauto\n",
  43                  what);
  44 @@ -124,7 +124,7 @@
  45                  return EXIT_FAILURE;
  46          }
  47
  48 -        name = strjoina(arg_dest, "/boot.automount");
  49 +        name = strjoina(arg_dest, "/boot-efi.automount");
  50          fclose(f);
  51          f = fopen(name, "wxe");
  52          if (!f) {
  53 @@ -136,7 +136,7 @@
  54                "[Unit]\n"
  55                "Description=EFI System Partition Automount\n\n"
  56                "[Automount]\n"
  57 -              "Where=/boot\n", f);
  58 +              "Where=/boot/efi\n", f);
  59
  60          fflush(f);
  61          if (ferror(f)) {
  62 @@ -144,10 +144,10 @@
  63                  return EXIT_FAILURE;
  64          }
  65
  66 -        name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
  67 +        name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount");
  68          mkdir_parents(name, 0755);
  69
  70 -        if (symlink("../boot.automount", name) < 0) {
  71 +        if (symlink("../boot-efi.automount", name) < 0) {
  72                  log_error_errno(errno, "Failed to create symlink %s: %m", name);
  73                  return EXIT_FAILURE;
  74          }