From e8ff8522b3676477cd42590f4ecae5f346981a10 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 22 Mar 2022 16:12:18 -0400 Subject: [PATCH] overlay/05core: ship by-id/coreos-boot-disk udev rule in initrd only The associated script only exists in the initrd. But also, we only need the symlink in the initrd anyway. Fixes 6d7b9ad5 ("overlay.d: add udev rule for creating stable symlink to boot disk"). Fixes https://github.com/openshift/os/issues/755. --- .../modules.d/35coreos-ignition}/80-coreos-boot-disk.rules | 0 .../usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename overlay.d/05core/usr/lib/{udev/rules.d => dracut/modules.d/35coreos-ignition}/80-coreos-boot-disk.rules (100%) diff --git a/overlay.d/05core/usr/lib/udev/rules.d/80-coreos-boot-disk.rules b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/80-coreos-boot-disk.rules similarity index 100% rename from overlay.d/05core/usr/lib/udev/rules.d/80-coreos-boot-disk.rules rename to overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/80-coreos-boot-disk.rules diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh index 96345f7107..74490c2e71 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh @@ -31,7 +31,8 @@ install() { inst_script "$moddir/coreos-gpt-setup.sh" \ "/usr/sbin/coreos-gpt-setup" - inst_simple "/usr/lib/udev/rules.d/80-coreos-boot-disk.rules" + inst_simple "$moddir/80-coreos-boot-disk.rules" \ + "/usr/lib/udev/rules.d/80-coreos-boot-disk.rules" inst_script "$moddir/coreos-disk-contains-fs.sh" \ "/usr/lib/udev/coreos-disk-contains-fs"