Added handling lxc-stop SIGPWR via stolen from Ubuntu service.

[packages/systemd.git] / pld-boot_efi_mount.patch

diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index ce43d661544b420773be2ad587d518ab29295efc..0077d0c92acdca375c24caab58d14615f69be27a 100644 (file)
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,15 +1,23 @@
 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
 --- systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c       2014-12-05 01:26:51.000000000 +0100
 +++ systemd-218/src/efi-boot-generator/efi-boot-generator.c    2015-04-02 15:45:18.000000000 +0200
-@@ -69,9 +69,9 @@
+@@ -69,15 +69,15 @@
                  return EXIT_SUCCESS;
          }
  
--        if (path_is_mount_point("/boot", true) <= 0 &&
--            dir_is_empty("/boot") <= 0) {
+-        r = path_is_mount_point("/boot", AT_SYMLINK_FOLLOW);
++        r = path_is_mount_point("/boot/efi", AT_SYMLINK_FOLLOW);
+         if (r > 0) {
+-                log_debug("/boot is already a mount point, exiting.");
++                log_debug("/boot/efi is already a mount point, exiting.");
+                 return EXIT_SUCCESS;
+         }
+         if (r == -ENOENT)
+-                log_debug("/boot does not exist, continuing.");
+-        else if (dir_is_empty("/boot") <= 0) {
 -                log_debug("/boot already populated, exiting.");
-+        if (path_is_mount_point("/boot/efi", true) <= 0 &&
-+            dir_is_empty("/boot/efi") <= 0) {
++                log_debug("/boot/efi does not exist, continuing.");
++        else if (dir_is_empty("/boot/efi") <= 0) {
 +                log_debug("/boot/efi already populated, exiting.");
                  return EXIT_SUCCESS;
          }
@@ -18,8 +26,8 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator
                  return EXIT_FAILURE;
          }
  
--        name = strappenda(arg_dest, "/boot.mount");
-+        name = strappenda(arg_dest, "/boot-efi.mount");
+-        name = strjoina(arg_dest, "/boot.mount");
++        name = strjoina(arg_dest, "/boot-efi.mount");
          f = fopen(name, "wxe");
          if (!f) {
                  log_error_errno(errno, "Failed to create mount unit file %s: %m", name);
@@ -45,8 +53,8 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator
                  return EXIT_FAILURE;
          }
  
--        name = strappenda(arg_dest, "/boot.automount");
-+        name = strappenda(arg_dest, "/boot-efi.automount");
+-        name = strjoina(arg_dest, "/boot.automount");
++        name = strjoina(arg_dest, "/boot-efi.automount");
          fclose(f);
          f = fopen(name, "wxe");
          if (!f) {
@@ -54,17 +62,17 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator
                "[Unit]\n"
                "Description=EFI System Partition Automount\n\n"
                "[Automount]\n"
--              "Where=/boot\n", f);
-+              "Where=/boot/efi\n", f);
+-              "Where=/boot\n"
++              "Where=/boot/efi\n"
+               "TimeoutIdleSec=120\n", f);
  
          fflush(f);
-         if (ferror(f)) {
 @@ -144,10 +144,10 @@
                  return EXIT_FAILURE;
          }
  
--        name = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
-+        name = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount");
+-        name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
++        name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount");
          mkdir_parents(name, 0755);
  
 -        if (symlink("../boot.automount", name) < 0) {