summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSimon Rettberg2024-01-30 14:58:13 +0100
committerSimon Rettberg2024-01-30 14:58:13 +0100
commit5b27c7d8f5a74fe8b21cc3b59cac3878b11ee6b3 (patch)
treeb9c92ccdf01f7e95e61c206b42a46f404163b3d0 /core
parent[run-virt] Fix corrupted vmx with additional NICs (diff)
downloadmltk-5b27c7d8f5a74fe8b21cc3b59cac3878b11ee6b3.tar.gz
mltk-5b27c7d8f5a74fe8b21cc3b59cac3878b11ee6b3.tar.xz
mltk-5b27c7d8f5a74fe8b21cc3b59cac3878b11ee6b3.zip
[disk-partitions] Don't wait for udev if we have disks from stage 3
When running the new dracut-init approach, we already loaded all the disk controller modules and scanned the buses. No need to wait for udev settle etc. in stage 4 again. For the old (unused) stage3.1 + stage3.2 approach, add a service droplet that keeps the old order.
Diffstat (limited to 'core')
-rw-r--r--core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service1
-rw-r--r--core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service.d/wait-udev.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service b/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service
index 0c8a0dd4..a196db3f 100644
--- a/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service
+++ b/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service
@@ -1,6 +1,5 @@
[Unit]
Description=Setup local disk partitions (persistent, swap)
-After=systemd-udev-settle.service systemd-udevd.service
Wants=tmp.target persistent.target
Before=persistent.target
DefaultDependencies=no
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service.d/wait-udev.conf b/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service.d/wait-udev.conf
new file mode 100644
index 00000000..41b7575e
--- /dev/null
+++ b/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service.d/wait-udev.conf
@@ -0,0 +1,2 @@
+[Unit]
+After=systemd-udev-settle.service systemd-udevd.service