From 9c2900299455d56ac999102fc58378e5a8a8a253 Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Mon, 3 May 2021 23:17:03 +0000
Subject: [PATCH] Release systemd version 247.3-1apertis4

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
---
 debian/changelog | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06fea325..f53511fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+systemd (247.3-1apertis4) apertis; urgency=medium
+
+  * Fix bashisms in kernel-install scripts.
+    Remove negotiation from `-z` to test for non-emptiness instead of
+    previously added version reversing those tests logic.
+  * kernel-install: allow to create $BOOT/$MACHINE_ID.
+    Commit [cf73f650890](https://github.com/systemd/systemd/commit/cf73f650890)
+    provides script `00-entry-directory.install` which creates the entry
+    directory only if `$BOOT/$MACHINE_ID` folder exists.
+    This part was moved out of `kernel-install` script and may introduce
+    the problem during upgrade since before Apertis v2022dev2 we do kernel
+    install with `$MACHINE_ID` generated in a build time. Later we remove
+    `/etc/machine-id` file allowing to generate an unique machine ID during
+    first boot, so there will be no directory `$BOOT/$MACHINE_ID` with a new
+    ID preventing from new entry generation during kernel upgrade in runtime.
+    Hence remove the part checking the `$BOOT/$MACHINE_ID` existence and
+    allow to create the proper entry in any case, returning the previous
+    `kernel-install` behaviour.
+  * Fix kernel-install call from update-initramfs.
+    Fix parameters assignment in `kernel-install` while calling
+    from `update-initramfs` or any package update except kernel.
+  * 85-initrd: fix the args number
+    `kernel-install` pass 5 args to modules anyway, so empty argument
+    do not allow to install the initrd file into boot entry directory.
+    Since we do not pass the initrd name via options module
+    `90-loaderentry.install` also skip the initrd copying and setup.
+  * Refresh patch for UEFI entries generator.
+    Update names for entry directories variables and fix options count.
+  * Fix the path to bootable binaries in efi entry
+    `stat` doesn't work well inside of the systemd-nspawn container
+    created by Debos returning "?" instead of mountpoint.
+    Fall back to the provided directory, since we have separate
+    partition for "/boot/efi".
+    This change allow to use correct paths for kernel and initrd
+    for entry generation.
+
+ -- Denis Pynkin <denis.pynkin@collabora.com>  Mon, 03 May 2021 23:16:58 +0000
+
 systemd (247.3-1apertis3) apertis; urgency=medium
 
   * Fix syntax in kernel-install.
-- 
GitLab