up to 254.1

diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index d60b7bbe80fdf70f43a0ac6fd85686a30c0775cd..7ed2147a8c0e7dd3b6ac8ebf7da3b078bc20457a 100644 (file)
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,5 +1,5 @@
---- systemd-stable-254/src/gpt-auto-generator/gpt-auto-generator.c.orig        2023-08-03 00:38:39.944343809 +0200
-+++ systemd-stable-254/src/gpt-auto-generator/gpt-auto-generator.c     2023-08-03 12:11:02.082294800 +0200
+--- systemd-stable-254.1/src/gpt-auto-generator/gpt-auto-generator.c.orig      2023-08-09 22:33:59.978475054 +0200
++++ systemd-stable-254.1/src/gpt-auto-generator/gpt-auto-generator.c   2023-08-09 22:41:09.618936068 +0200
 @@ -487,6 +487,18 @@
          return cache;
  }
@@ -16,10 +16,10 @@
 +        return cache;
 +}
 +
- static int slash_efi_in_fstab(void) {
-         static int cache = -1;
- 
-@@ -514,6 +526,21 @@
+ static int add_partition_xbootldr(DissectedPartition *p) {
+         _cleanup_free_ char *options = NULL;
+         int r;
+@@ -562,6 +574,21 @@
          return (cache = false);
  }
  
@@ -38,18 +38,17 @@
 +        return (cache = false);
 +}
 +
- static int add_partition_xbootldr(DissectedPartition *p) {
+ static int add_partition_esp(DissectedPartition *p, bool has_xbootldr) {
+         const char *esp_path = NULL, *id = NULL;
          _cleanup_free_ char *options = NULL;
-         int r;
-@@ -574,29 +601,29 @@
+@@ -582,19 +609,19 @@
+         if (r > 0)
                  return 0;
-         }
  
 -        /* If /boot/ is present, unused, and empty, we'll take that.
 +        /* If /boot/efi is present, unused, and empty, we'll take that.
           * Otherwise, if /efi/ is unused and empty (or missing), we'll take that.
-          * Otherwise, we do nothing.
-          */
+          * Otherwise, we do nothing. */
 -        if (!has_xbootldr && slash_boot_exists()) {
 -                r = slash_boot_in_fstab();
 +        if (!has_xbootldr && slash_boot_efi_exists()) {
@@ -66,16 +65,4 @@
 +                                esp_path = "/boot/efi";
                                  id = "boot";
                          }
-                 } else {
--                        /* Check if the fstab entry for /boot/ is already the ESP. If so, we don't need to
-+                        /* Check if the fstab entry for /boot/efi is already the ESP. If so, we don't need to
-                          * check /efi/ or duplicate the mount there. */
--                        r = fstab_is_mount_point_full("/boot", p->node);
-+                        r = fstab_is_mount_point_full("/boot/efi", p->node);
-                         if (r < 0)
-                                 return log_error_errno(r,
--                                                       "Failed to check if fstab entry for /boot uses the same device as '%s': %m",
-+                                                       "Failed to check if fstab entry for /boot/efi uses the same device as '%s': %m",
-                                                        p->node);
-                         if (r > 0)
-                                 return 0;
+                 }

diff --git a/systemd.spec b/systemd.spec
index 7d175bfcf778eb3f067d1877bf60422811e1da1c..d36adf6eef2a98f2b5bae699661f951177404ce8 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -32,14 +32,14 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       254
+Version:       254.1
 Release:       0.1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 #Source0Download: https://github.com/systemd/systemd/releases
 Source0:       https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 5d72697237ad9b4ece31ed0c558fc125
+# Source0-md5: d9eb0fb54745c30822b43148f3fe0fb5
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service