From c0d9213ac85e3ca04d2d9ff85af0c7df1b9da86c Mon Sep 17 00:00:00 2001 From: jumpyvi Date: Thu, 22 Oct 2026 11:10:00 -0400 Subject: [PATCH 1/5] Fix var/run symlink --- mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf index 91f1c1e06..f2aa73f7a 100644 --- a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf +++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf @@ -1,3 +1,4 @@ d /var/spool/anacron 0755 root root - - d /var/spool/rsyslog 0755 root root - - d /var/run/speech-dispatcher 0755 speech-dispatcher speech-dispatcher - - +L+ /var/run - - - - ../run \ No newline at end of file From 19834bb263d8a857191d6f25ff11678ffeca5f2c Mon Sep 17 00:00:00 2001 From: Lewis Goddard Date: Fri, 23 Oct 2026 03:32:20 +0100 Subject: [PATCH 2/5] Update speech-dispatcher path in sysusers config --- .../base/mkosi.extra/usr/lib/sysusers.d/00-session.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf index d3b0738fd..74cd2d3c6 100644 --- a/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf +++ b/mkosi.images/base/mkosi.extra/usr/lib/sysusers.d/00-session.conf @@ -2,5 +2,5 @@ u lightdm - "Light Display Manager" /var/lib/lightdm /usr/sbin/nologin u geoclue - "Geoclue Service" /var/lib/geoclue /usr/sbin/nologin g messagebus 987 u messagebus 987:987 "System Message Bus" /nonexistent /usr/sbin/nologin -u speech-dispatcher - "Speech Dispatcher" /var/run/speech-dispatcher /sbin/nologin +u speech-dispatcher - "Speech Dispatcher" /run/speech-dispatcher /sbin/nologin g speech-dispatcher - - - - From 2e933d54529d09c4e2c0716704391ac705c3d458 Mon Sep 17 00:00:00 2001 From: Lewis Goddard Date: Fri, 23 Oct 2026 03:33:43 +0100 Subject: [PATCH 3/5] Modify var.conf to override systemd settings Removed specific entries for anacron, rsyslog, and speech-dispatcher. Added a comment indicating the file overrides a systemd configuration. --- mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf index f2aa73f7a..073794975 100644 --- a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf +++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/var.conf @@ -1,4 +1,3 @@ -d /var/spool/anacron 0755 root root - - -d /var/spool/rsyslog 0755 root root - - -d /var/run/speech-dispatcher 0755 speech-dispatcher speech-dispatcher - - -L+ /var/run - - - - ../run \ No newline at end of file +# This overrides the same file from systemd. +L+ /var/run - - - - ../run +d /var/spool/anacron 0755 root root - From 6a0e12d1e7a0462b641e202077323b5083ba9e68 Mon Sep 17 00:00:00 2001 From: Lewis Goddard Date: Fri, 23 Oct 2026 03:58:03 +0100 Subject: [PATCH 4/5] Remove /etc/nsswitch.conf from tmpfiles configuration. --- mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf index 63d58cdd9..a44a8ce51 100644 --- a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf +++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/etc.conf @@ -29,7 +29,6 @@ L /etc/ld.so.conf L /etc/ld.so.conf.d # Contains the default systemd locale L /etc/locale.conf -L /etc/nsswitch.conf # ID C /etc/passwd From f7ed4876a7002a685bbcf04a4cc2e951518f0ec2 Mon Sep 17 00:00:00 2001 From: Lewis Goddard Date: Fri, 23 Oct 2026 03:58:16 +0100 Subject: [PATCH 5/5] Add symlink for nsswitch.conf to allow updates Override debian.conf to symlink instead of copy to get updates when they appear upstream. --- .../base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf new file mode 100644 index 000000000..6631c41fc --- /dev/null +++ b/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/00-nsswitch.conf @@ -0,0 +1,2 @@ +# Override debian.conf to symlink instead of copy to get updates when they appear upstream. +L /etc/nsswitch.conf