From 70a42948aa1a4713ab8026febe5b608d0339781bc18c22081003b74561ef013a Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Thu, 15 May 2025 16:27:42 +0000 Subject: [PATCH] ironic-ipa-ramdisk: make sure the udev rule is also matched on changes Signed-off-by: Marco Chiappero --- ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec | 2 +- ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount | 2 +- .../etc/systemd/system/systemd-udevd.service.d/ordering.conf | 3 +++ ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules | 1 - ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf delete mode 100644 ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules create mode 100644 ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules diff --git a/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec index 7a485c6..365aced 100644 --- a/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec +++ b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec @@ -19,7 +19,7 @@ Name: ironic-ipa-ramdisk -Version: 3.0.5 +Version: 3.0.6 Release: 0 Summary: Kernel and ramdisk image for OpenStack Ironic License: SUSE-EULA diff --git a/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount b/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount index b718b8b..22ecadd 100644 --- a/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount +++ b/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount @@ -4,4 +4,4 @@ Description=config-2 rom consumed by IPA for networking configuration [Mount] What=/dev/ipa Where=/mnt/ipa -TimeoutSec=60 +TimeoutSec=30 diff --git a/ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf b/ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf new file mode 100644 index 0000000..641d5e9 --- /dev/null +++ b/ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf @@ -0,0 +1,3 @@ +[Unit] +Before=local-fs.target +WantedBy=local-fs.target diff --git a/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules b/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules deleted file mode 100644 index 045eee2..0000000 --- a/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="config-2", ENV{ID_FS_PUBLISHER_ID}=="?*", PROGRAM="/usr/local/bin/suse-test-config-2.sh", SYMLINK+="ipa ipa-config-2" diff --git a/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules b/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules new file mode 100644 index 0000000..446fec7 --- /dev/null +++ b/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules @@ -0,0 +1 @@ +ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="config-2", ENV{ID_FS_PUBLISHER_ID}=="?*", PROGRAM="/usr/local/bin/suse-test-config-2.sh", SYMLINK+="ipa"