From 621a7fe0647eca4ced4914c1c9beb569678b304b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 Jun 2024 10:10:26 +0100 Subject: [PATCH 1/2] mkosi: install new split-out systemd packages repart and cryptsetup tools were moved out of the main package to reduce dependencies. --- mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 4 ++++ .../mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf | 2 ++ 2 files changed, 6 insertions(+) diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf index ecac78049d..cb463d3a7a 100644 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf @@ -22,10 +22,12 @@ VolatilePackages= systemd systemd-container systemd-coredump + systemd-cryptsetup systemd-dev systemd-homed systemd-journal-remote systemd-oomd + systemd-repart systemd-resolved systemd-sysv systemd-tests @@ -87,4 +89,6 @@ InitrdPackages= InitrdVolatilePackages= systemd + systemd-cryptsetup + systemd-repart udev diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf index b53b3dcffe..2bb6164aa4 100644 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf @@ -16,10 +16,12 @@ VolatilePackages= systemd-boot-dbgsym systemd-container-dbgsym systemd-coredump-dbgsym + systemd-cryptsetup-dbgsym systemd-dbgsym systemd-homed-dbgsym systemd-journal-remote-dbgsym systemd-oomd-dbgsym + systemd-repart-dbgsym systemd-resolved-dbgsym systemd-tests-dbgsym systemd-timesyncd-dbgsym From 8a91a43197b63e84f6a7439585204a36c70040ba Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 Jun 2024 10:20:27 +0100 Subject: [PATCH 2/2] mkosi: bump Debian Salsa commit to latest --- mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf index cb463d3a7a..a3481e9564 100644 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf @@ -9,7 +9,7 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=596a70511736d78c1d8a5a27dca3989806cfa733 + GIT_COMMIT=1ff79fafa73da1b5e40c7b92140ce3fd4229a048 VolatilePackages= libnss-myhostname