From 9013347ba956c0c2f34f011c54f421a13912b7ab Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Tue, 5 Mar 2024 09:54:47 +0100 Subject: [PATCH 1/2] Don't install systemdstatedir (/var/lib/systemd) systemdstatedir is created by tmpfiles conf (tmpfiles.d/systemd.conf.in) already. By shipping it, systemd prevents the effect of tmpfiles.d/var.conf.in: q /var 0755 - - - This should helps implementing the "Hermetic /usr" pattern. Links: https://0pointer.net/blog/fitting-everything-together.html --- meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/meson.build b/meson.build index 67c495155d..a68fc386e6 100644 --- a/meson.build +++ b/meson.build @@ -2820,8 +2820,6 @@ install_data('LICENSE.GPL2', install_subdir('LICENSES', install_dir : docdir) -install_emptydir(systemdstatedir) - ##################################################################### # Ensure that changes to the docs/ directory do not break the From 15075cfe268bb2042476493a14b8da11c58060a4 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 2 Feb 2026 16:28:55 +0100 Subject: [PATCH 2/2] mkosi: update debian commit reference to ecec6127927ca59726e3d3535a2b2344f585cf74 * ecec612792 Stop installing /var/lib/systemd/ * 120f84266d d/rules: use --no-also for networkd and journald * 41780703f2 d/rules: do not restart sockets, it fails if the service is running * 5f219fbd65 Increase number of sections of sd-stub on amd64 too * 5832d7f614 d/systemd.postinst: use --no-dbus for daemon-reexec --- mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf index 4d1c4d2232..1d2a2d6430 100644 --- a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf @@ -9,5 +9,5 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=6f4d90be5cb4075954f0a36653105e586a9a1fa9 + GIT_COMMIT=ecec6127927ca59726e3d3535a2b2344f585cf74 PKG_SUBDIR=debian