From 143a1f1039d992001d2f2f35b2e6ba07f8a52af7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Dec 2022 17:23:00 +0100 Subject: [PATCH 1/2] =?UTF-8?q?units:=20change=20modprobe@dm-mod.service?= =?UTF-8?q?=20=E2=86=92=20modprobe@dm=5Fmod.service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up for 8f1359bf854e9683e4e0b89fd3a537e0d82d4b95 --- units/systemd-nspawn@.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in index f3226cdf60..e1626b9c87 100644 --- a/units/systemd-nspawn@.service.in +++ b/units/systemd-nspawn@.service.in @@ -10,7 +10,7 @@ [Unit] Description=Container %i Documentation=man:systemd-nspawn(1) -Wants=modprobe@tun.service modprobe@loop.service modprobe@dm-mod.service +Wants=modprobe@tun.service modprobe@loop.service modprobe@dm_mod.service PartOf=machines.target Before=machines.target After=network.target modprobe@tun.service modprobe@loop.service modprobe@dm_mod.service From ce7dcfd6b00b8099d1793d04bcfa9968ca4a0d96 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Dec 2022 17:23:14 +0100 Subject: [PATCH 2/2] units: pull in loop.ko and dm-mod.ko before repart We want to make use of that when formatting file systems, hence let's pull in these modules explicitly. (This is necessary because we are an early boot service that might run before systemd-tmpfiles-dev.service, which creates /dev/loop-control and /dev/mapper/control.) Alternatively we could just order ourselves after systemd-tmpfiles-dev.service, but I think there's value in adding an explicit minimal ordering here, since we know what we'll need. Fixes: #25775 --- units/systemd-repart.service.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in index 92e0a9b3cd..105be680cd 100644 --- a/units/systemd-repart.service.in +++ b/units/systemd-repart.service.in @@ -12,7 +12,8 @@ Description=Repartition Root Disk Documentation=man:systemd-repart.service(8) DefaultDependencies=no Conflicts=shutdown.target -After=initrd-usr-fs.target +Wants=modprobe@loop.service modprobe@dm_mod.service +After=initrd-usr-fs.target modprobe@loop.service modprobe@dm_mod.service Before=initrd-root-fs.target shutdown.target ConditionVirtualization=!container ConditionDirectoryNotEmpty=|/usr/lib/repart.d