From 5b27c7d8f5a74fe8b21cc3b59cac3878b11ee6b3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 30 Jan 2024 14:58:13 +0100
Subject: [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.
---
 .../disk-partitions/data/etc/systemd/system/setup-partitions.service    | 1 -
 .../data/etc/systemd/system/setup-partitions.service.d/wait-udev.conf   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service.d/wait-udev.conf

(limited to 'core')

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
-- 
cgit v1.2.3-55-g7522