From: Lennart Poettering Date: Thu, 23 Jan 2025 13:49:46 +0000 (+0100) Subject: units: don't load squasfs/erofs kmods explicitly X-Git-Tag: v258-rc1~1509^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F36132%2Fhead;p=thirdparty%2Fsystemd.git units: don't load squasfs/erofs kmods explicitly File system modules should be something the kernel can autoload automatically, and according to my testing that works fine, hence let's drop the explicit deps, in particular as systems usually stick to one fs for these things, not both. I inquired bluca about the reason to add it, and didn't remember anymore, and was fine with me removing this. So let's remove this for now, should issues arise we can revert this. --- diff --git a/units/systemd-confext-initrd.service b/units/systemd-confext-initrd.service index 4655018567d..22461fa7120 100644 --- a/units/systemd-confext-initrd.service +++ b/units/systemd-confext-initrd.service @@ -24,8 +24,8 @@ Before=local-fs-pre.target cryptsetup-pre.target systemd-tmpfiles-setup.service Wants=local-fs-pre.target cryptsetup-pre.target Conflicts=initrd-switch-root.target Before=initrd-switch-root.target -Wants=modprobe@loop.service modprobe@dm_mod.service modprobe@squashfs.service modprobe@erofs.service -After=modprobe@loop.service modprobe@dm_mod.service modprobe@squashfs.service modprobe@erofs.service +Wants=modprobe@loop.service modprobe@dm_mod.service +After=modprobe@loop.service modprobe@dm_mod.service [Service] Type=oneshot diff --git a/units/systemd-sysext-initrd.service b/units/systemd-sysext-initrd.service index 4f0b8ff4de4..f21990aad01 100644 --- a/units/systemd-sysext-initrd.service +++ b/units/systemd-sysext-initrd.service @@ -23,8 +23,8 @@ Before=local-fs-pre.target cryptsetup-pre.target systemd-tmpfiles-setup.service Wants=local-fs-pre.target cryptsetup-pre.target Conflicts=initrd-switch-root.target Before=initrd-switch-root.target -Wants=modprobe@loop.service modprobe@dm_mod.service modprobe@squashfs.service modprobe@erofs.service -After=modprobe@loop.service modprobe@dm_mod.service modprobe@squashfs.service modprobe@erofs.service +Wants=modprobe@loop.service modprobe@dm_mod.service +After=modprobe@loop.service modprobe@dm_mod.service [Service] Type=oneshot