Version in base suite: 21.01-1

Base version: ltsp_21.01-1
Target version: ltsp_21.01-1+deb11u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/l/ltsp/ltsp_21.01-1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/l/ltsp/ltsp_21.01-1+deb11u1.dsc

 changelog                                                               |    9 +++
 patches/0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch |   26 ++++++++++
 patches/README                                                          |    3 +
 patches/series                                                          |    1 
 4 files changed, 39 insertions(+)

diff -Nru ltsp-21.01/debian/changelog ltsp-21.01/debian/changelog
--- ltsp-21.01/debian/changelog	2021-01-11 22:22:12.000000000 +0000
+++ ltsp-21.01/debian/changelog	2023-08-22 16:32:24.000000000 +0000
@@ -1,3 +1,12 @@
+ltsp (21.01-1+deb11u1) bullseye; urgency=medium
+
+  * debian/patches:
+    + Add 0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch
+      (cherry-picked from upstream). Avoid mv on init symlink in order to
+      work around overlayfs issue. (Closes: #1049397).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 22 Aug 2023 18:32:24 +0200
+
 ltsp (21.01-1) unstable; urgency=medium
 
   [ Alkis Georgopoulos ]
diff -Nru ltsp-21.01/debian/patches/0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch ltsp-21.01/debian/patches/0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch
--- ltsp-21.01/debian/patches/0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch	1970-01-01 00:00:00.000000000 +0000
+++ ltsp-21.01/debian/patches/0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch	2023-08-22 16:32:24.000000000 +0000
@@ -0,0 +1,26 @@
+From 19ccbb7c4a5daeebacb4157bea772e26c3fb0f44 Mon Sep 17 00:00:00 2001
+From: gber <guido+github.com@berhoerster.name>
+Date: Thu, 17 Aug 2023 09:45:49 +0200
+Subject: [PATCH] Avoid mv on init symlink in order to work around overlayfs
+ issue (#860)
+
+Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+---
+ ltsp/client/initrd-bottom/55-initrd-bottom.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/ltsp/client/initrd-bottom/55-initrd-bottom.sh
++++ b/ltsp/client/initrd-bottom/55-initrd-bottom.sh
+@@ -80,8 +80,10 @@
+     fi
+     # To avoid specifying an init=, we override the real init.
+     # We can't mount --bind as it's in use by libraries and can't be unmounted.
+-    re mv "$rootmnt/sbin/init" "$rootmnt/sbin/init.ltsp"
+-    re ln -s ../../usr/share/ltsp/client/init/init "$rootmnt/sbin/init"
++    # With Linux 6.1 rename(2) on the symlink fails with ENXIO, so do not use
++    # mv for now (see #860).
++    re cp -a "$rootmnt/sbin/init" "$rootmnt/sbin/init.ltsp"
++    re ln -sf ../../usr/share/ltsp/client/init/init "$rootmnt/sbin/init"
+     # Jessie needs a 3.18+ kernel and this initramfs-tools hack:
+     if grep -qs jessie /etc/os-release; then
+         echo "init=${init:-/sbin/init}" >> /scripts/init-bottom/ORDER
diff -Nru ltsp-21.01/debian/patches/README ltsp-21.01/debian/patches/README
--- ltsp-21.01/debian/patches/README	1970-01-01 00:00:00.000000000 +0000
+++ ltsp-21.01/debian/patches/README	2023-08-22 16:30:35.000000000 +0000
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff -Nru ltsp-21.01/debian/patches/series ltsp-21.01/debian/patches/series
--- ltsp-21.01/debian/patches/series	2021-01-11 19:45:10.000000000 +0000
+++ ltsp-21.01/debian/patches/series	2023-08-22 16:30:46.000000000 +0000
@@ -1 +1,2 @@
 0001-Prefer-resolvectl-over-systemd-resolve-367.patch
+0001_Avoid-mv-on-init-symlink-in-order-to-work-around-ove.patch