Bug#1021838: bullseye-pu: package binfmt-support/2.2.1-1+deb11u1
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
[ Reason ]
https://bugs.debian.org/1012154 reported a startup issue due to a race
between systemd-binfmt.service and binfmt-support.service (which has
probably been around for a long time). https://bugs.debian.org/1021822
mentions that it would be helpful to have the fix for this in stable as
well, which I agree with.
[ Impact ]
binfmt-support.service will sometimes fail to start, so binary format
specifications registered with it may or may not do anything depending
on luck at boot time.
[ Tests ]
None, sorry.
[ Risks ]
The patch came from a systemd maintainer and is pretty simple: it just
ensures ordering. I haven't heard of any issues introduced by it in
bookworm.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
(of course I'll apply s/UNRELEASED/bullseye/ before uploading)
diff -Nru binfmt-support-2.2.1/debian/.git-dpm binfmt-support-2.2.1/debian/.git-dpm
--- binfmt-support-2.2.1/debian/.git-dpm 2020-04-17 20:46:23.000000000 +0100
+++ binfmt-support-2.2.1/debian/.git-dpm 2022-10-15 18:02:17.000000000 +0100
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-74fe6952c89159bff00252265ab7c167ec44aad5
-74fe6952c89159bff00252265ab7c167ec44aad5
+d8f17525d5d66a4c6694ec9ebf32a174ea74f3e3
+d8f17525d5d66a4c6694ec9ebf32a174ea74f3e3
74fe6952c89159bff00252265ab7c167ec44aad5
74fe6952c89159bff00252265ab7c167ec44aad5
binfmt-support_2.2.1.orig.tar.gz
diff -Nru binfmt-support-2.2.1/debian/changelog binfmt-support-2.2.1/debian/changelog
--- binfmt-support-2.2.1/debian/changelog 2020-04-17 20:46:23.000000000 +0100
+++ binfmt-support-2.2.1/debian/changelog 2022-10-15 18:02:19.000000000 +0100
@@ -1,3 +1,10 @@
+binfmt-support (2.2.1-1+deb11u1) UNRELEASED; urgency=medium
+
+ * Run binfmt-support.service after systemd-binfmt.service (thanks, Michael
+ Biebl; closes: #1012154, #1021822).
+
+ -- Colin Watson <cjwatson@debian.org> Sat, 15 Oct 2022 18:02:19 +0100
+
binfmt-support (2.2.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru binfmt-support-2.2.1/debian/patches/series binfmt-support-2.2.1/debian/patches/series
--- binfmt-support-2.2.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ binfmt-support-2.2.1/debian/patches/series 2022-10-15 18:02:17.000000000 +0100
@@ -0,0 +1 @@
+systemd-ordering.patch
diff -Nru binfmt-support-2.2.1/debian/patches/systemd-ordering.patch binfmt-support-2.2.1/debian/patches/systemd-ordering.patch
--- binfmt-support-2.2.1/debian/patches/systemd-ordering.patch 1970-01-01 01:00:00.000000000 +0100
+++ binfmt-support-2.2.1/debian/patches/systemd-ordering.patch 2022-10-15 18:02:17.000000000 +0100
@@ -0,0 +1,43 @@
+From d8f17525d5d66a4c6694ec9ebf32a174ea74f3e3 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl@debian.org>
+Date: Thu, 2 Jun 2022 12:56:11 +0200
+Subject: Run binfmt-support.service after systemd-binfmt.service
+
+This fixes a race condition during boot when both services try to access
+/proc/sys/fs/binfmt_misc/register at the same time which can lead to the
+following error:
+
+ systemd[1]: Starting Enable support for additional executable binary formats...
+ update-binfmts[536]: update-binfmts: warning: unable to close /proc/sys/fs/binfmt_misc/register: File exists
+ update-binfmts[536]: update-binfmts: warning: unable to close /proc/sys/fs/binfmt_misc/register: File exists
+ update-binfmts[536]: update-binfmts: warning: unable to close /proc/sys/fs/binfmt_misc/register: File exists
+ update-binfmts[536]: update-binfmts: exiting due to previous errors
+ systemd[1]: binfmt-support.service: Main process exited, code=exited, status=2/INVALIDARGUMENT
+ systemd[1]: binfmt-support.service: Failed with result 'exit-code'.
+ systemd[1]: Failed to start Enable support for additional executable binary formats.
+
+Fixes Debian bug #1012154.
+
+Origin: upstream, https://gitlab.com/cjwatson/binfmt-support/-/commit/54f0e1af8ac6bcaf4594747df8965b5c5bdd3744
+Bug-Debian: https://bugs.debian.org/1012154
+Bug-Debian: https://bugs.debian.org/1021822
+Last-Update: 2022-10-15
+
+Patch-Name: systemd-ordering.patch
+---
+ init/systemd/binfmt-support.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/init/systemd/binfmt-support.service.in b/init/systemd/binfmt-support.service.in
+index 25c30e2..f6d0d4d 100644
+--- a/init/systemd/binfmt-support.service.in
++++ b/init/systemd/binfmt-support.service.in
+@@ -20,7 +20,7 @@
+ Description=Enable support for additional executable binary formats
+ Documentation=man:update-binfmts(8)
+ DefaultDependencies=false
+-After=local-fs.target proc-sys-fs-binfmt_misc.automount
++After=local-fs.target proc-sys-fs-binfmt_misc.automount systemd-binfmt.service
+
+ [Service]
+ Type=oneshot
Thanks,
--
Colin Watson (he/him) [cjwatson@debian.org]
Reply to: