diff --git a/SOURCES/0102.patch b/SOURCES/0102.patch new file mode 100644 index 0000000..6dad72b --- /dev/null +++ b/SOURCES/0102.patch @@ -0,0 +1,54 @@ +From ae61b2c93a032c3e74950d6730d32363fed9621f Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski +Date: Thu, 24 Apr 2025 17:51:01 -0400 +Subject: [PATCH] fix(multipath): disable user_friendly_names with mpathconf + +If dracut is creating /etc/multipath.conf by calling mpathconf in either +multipathd-configure.service or multipathd.sh, there is a chance that +the multipath config in the real root differs. Specifically, it might +have chosen different user_friendly_names for the devices. When the +systems switches to the real root, multipath may not be able to switch +the devices to their configured names because those might already be +in use. To avoid this, call mpathconf with "--user_friendly_names n" +to create a multipath.conf with user_friendly_names disabled. If all +devices use WWID names, it is always possible for multipath to rename +them later. + +Fixes b8a92b715 ("multipath: add automatic configuration for multipath") + +(cherry picked from commit f36f2869859eb5f9613a94a28dfaf31505e645cc) + +Resolves: RHEL-117128 +--- + modules.d/90multipath/multipathd-configure.service | 2 +- + modules.d/90multipath/multipathd.sh | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/modules.d/90multipath/multipathd-configure.service b/modules.d/90multipath/multipathd-configure.service +index de690615..6dedd9b9 100644 +--- a/modules.d/90multipath/multipathd-configure.service ++++ b/modules.d/90multipath/multipathd-configure.service +@@ -13,7 +13,7 @@ ConditionPathExists=!/etc/multipath.conf + [Service] + Type=oneshot + ExecStartPre=-/usr/bin/mkdir -p /etc/multipath/multipath.conf.d +-ExecStart=/usr/sbin/mpathconf --enable ++ExecStart=/usr/sbin/mpathconf --enable --user_friendly_names n + + [Install] + WantedBy=sysinit.target +diff --git a/modules.d/90multipath/multipathd.sh b/modules.d/90multipath/multipathd.sh +index 62649003..6b6b2666 100755 +--- a/modules.d/90multipath/multipathd.sh ++++ b/modules.d/90multipath/multipathd.sh +@@ -2,7 +2,8 @@ + + if [ "$(getarg rd.multipath)" = "default" ] && [ ! -e /etc/multipath.conf ]; then + mkdir -p /etc/multipath/multipath.conf.d +- mpathconf --enable ++ mpathconf --enable --user_friendly_names n ++ + fi + + if getargbool 1 rd.multipath && [ -e /etc/multipath.conf ]; then + diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec index 1865b4e..ce44e2d 100644 --- a/SPECS/dracut.spec +++ b/SPECS/dracut.spec @@ -5,7 +5,7 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 102.git20250818 +%define dist_free_release 104.git20250919 Name: dracut Version: 057 @@ -128,6 +128,7 @@ Patch98: 0098.patch Patch99: 0099.patch Patch100: 0100.patch Patch101: 0101.patch +Patch102: 0102.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt @@ -584,6 +585,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Fri Sep 19 2025 Pavel Valena - 057-104.git20250919 +- fix(multipath): disable user_friendly_names with mpathconf + * Mon Aug 18 2025 Pavel Valena - 057-102.git20250818 - fix(systemd): partial backport of