pld-boot_efi_mount.patch

   1 diff -dur systemd-208.orig/src/efi-boot-generator/efi-boot-generator.c systemd-208/src/efi-boot-generator/efi-boot-generator.c
   2 --- systemd-208.orig/src/efi-boot-generator/efi-boot-generator.c        2013-09-25 03:38:17.000000000 +0200
   3 +++ systemd-208/src/efi-boot-generator/efi-boot-generator.c     2014-01-22 21:05:38.281137494 +0100
   4 @@ -52,7 +52,7 @@
   5          if (!is_efi_boot())
   6                  return EXIT_SUCCESS;
   7
   8 -        if (dir_is_empty("/boot") <= 0)
   9 +        if (dir_is_empty("/boot/efi") <= 0)
  10                  return EXIT_SUCCESS;
  11
  12          r = efi_loader_get_device_part_uuid(&id);
  13 @@ -63,7 +63,7 @@
  14                  return EXIT_FAILURE;
  15          }
  16
  17 -        name = strjoin(arg_dest, "/boot.mount", NULL);
  18 +        name = strjoin(arg_dest, "/boot-efi.mount", NULL);
  19          if (!name) {
  20                  log_oom();
  21                  return EXIT_FAILURE;
  22 @@ -80,13 +80,13 @@
  23                  "[Unit]\n"
  24                  "Description=EFI System Partition\n\n"
  25                  "[Mount]\n"
  26 -                "Where=/boot\n"
  27 +                "Where=/boot/efi\n"
  28                  "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
  29                  "Options=umask=0077\n",
  30                  SD_ID128_FORMAT_VAL(id));
  31
  32          free(name);
  33 -        name = strjoin(arg_dest, "/boot.automount", NULL);
  34 +        name = strjoin(arg_dest, "/boot-efi.automount", NULL);
  35          if (!name) {
  36                  log_oom();
  37                  return EXIT_FAILURE;
  38 @@ -103,10 +103,10 @@
  39                "[Unit]\n"
  40                "Description=EFI System Partition Automount\n\n"
  41                "[Automount]\n"
  42 -              "Where=/boot\n", f);
  43 +              "Where=/boot/efi\n", f);
  44
  45          free(name);
  46 -        name = strjoin(arg_dest, "/local-fs.target.wants/boot.automount", NULL);
  47 +        name = strjoin(arg_dest, "/local-fs.target.wants/boot-efi.automount", NULL);
  48          if (!name) {
  49                  log_oom();
  50                  return EXIT_FAILURE;
  51 @@ -114,7 +114,7 @@
  52
  53          mkdir_parents(name, 0755);
  54
  55 -        if (symlink("../boot.automount", name) < 0) {
  56 +        if (symlink("../boot-efi.automount", name) < 0) {
  57                  log_error("Failed to create symlink %s: %m", name);
  58                  return EXIT_FAILURE;
  59          }