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,15 +69,15 @@
   5                  return EXIT_SUCCESS;
   6          }
   7
   8 -        r = path_is_mount_point("/boot", AT_SYMLINK_FOLLOW);
   9 +        r = path_is_mount_point("/boot/efi", AT_SYMLINK_FOLLOW);
  10          if (r > 0) {
  11 -                log_debug("/boot is already a mount point, exiting.");
  12 +                log_debug("/boot/efi is already a mount point, exiting.");
  13                  return EXIT_SUCCESS;
  14          }
  15          if (r == -ENOENT)
  16 -                log_debug("/boot does not exist, continuing.");
  17 -        else if (dir_is_empty("/boot") <= 0) {
  18 -                log_debug("/boot already populated, exiting.");
  19 +                log_debug("/boot/efi does not exist, continuing.");
  20 +        else if (dir_is_empty("/boot/efi") <= 0) {
  21 +                log_debug("/boot/efi already populated, exiting.");
  22                  return EXIT_SUCCESS;
  23          }
  24
  25 @@ -84,7 +84,7 @@
  26                  return EXIT_FAILURE;
  27          }
  28
  29 -        name = strjoina(arg_dest, "/boot.mount");
  30 +        name = strjoina(arg_dest, "/boot-efi.mount");
  31          f = fopen(name, "wxe");
  32          if (!f) {
  33                  log_error_errno(errno, "Failed to create mount unit file %s: %m", name);
  34 @@ -105,7 +105,7 @@
  35                  "Description=EFI System Partition\n"
  36                  "Documentation=man:systemd-efi-boot-generator(8)\n");
  37
  38 -        r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat");
  39 +        r = generator_write_fsck_deps(f, arg_dest, what, "/boot/efi", "vfat");
  40          if (r < 0)
  41                  return EXIT_FAILURE;
  42
  43 @@ -113,7 +113,7 @@
  44                  "\n"
  45                  "[Mount]\n"
  46                  "What=%s\n"
  47 -                "Where=/boot\n"
  48 +                "Where=/boot/efi\n"
  49                  "Type=vfat\n"
  50                  "Options=umask=0077,noauto\n",
  51                  what);
  52 @@ -124,7 +124,7 @@
  53                  return EXIT_FAILURE;
  54          }
  55
  56 -        name = strjoina(arg_dest, "/boot.automount");
  57 +        name = strjoina(arg_dest, "/boot-efi.automount");
  58          fclose(f);
  59          f = fopen(name, "wxe");
  60          if (!f) {
  61 @@ -136,7 +136,7 @@
  62                "[Unit]\n"
  63                "Description=EFI System Partition Automount\n\n"
  64                "[Automount]\n"
  65 -              "Where=/boot\n"
  66 +              "Where=/boot/efi\n"
  67                "TimeoutIdleSec=120\n", f);
  68
  69          fflush(f);
  70 @@ -144,10 +144,10 @@
  71                  return EXIT_FAILURE;
  72          }
  73
  74 -        name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
  75 +        name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount");
  76          mkdir_parents(name, 0755);
  77
  78 -        if (symlink("../boot.automount", name) < 0) {
  79 +        if (symlink("../boot-efi.automount", name) < 0) {
  80                  log_error_errno(errno, "Failed to create symlink %s: %m", name);
  81                  return EXIT_FAILURE;
  82          }