Backport PR #2196 to fix boot with iso-scan feature

This commit is contained in:
Adam Williamson 2023-10-05 09:11:19 -07:00
parent 7e84f1c282
commit e2193523c3
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 7b530f26368d723dcc34fb67d687c60009b06412 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 9 Feb 2023 05:26:30 -0500
Subject: [PATCH] fix: make iso-scan trigger udev events
Fixes #2183
---
modules.d/90dmsquash-live/iso-scan.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
index 886d2303..fa06b33c 100755
--- a/modules.d/90dmsquash-live/iso-scan.sh
+++ b/modules.d/90dmsquash-live/iso-scan.sh
@@ -22,6 +22,7 @@ do_iso_scan() {
mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
if [ -f "/run/initramfs/isoscan/$isofile" ]; then
losetup -f "/run/initramfs/isoscan/$isofile"
+ udevadm trigger --action=add > /dev/null 2>&1
ln -s "$dev" /run/initramfs/isoscandev
rm -f -- "$job"
exit 0
--
2.41.0

View File

@ -7,7 +7,7 @@
%global __requires_exclude pkg-config
# rpmdev-bumpspec and releng automation compatible variable
%global baserelease 13
%global baserelease 14
Name: dracut
Version: 059
@ -74,6 +74,11 @@ Patch10: 2184-add-nvmeof-module.patch
# https://github.com/dracutdevs/dracut/pull/2277
Patch11: 0001-fix-dracut.sh-use-dynamically-uefi-s-sections-offset.patch
# fix iso-scan feature by triggering udev events
# https://github.com/dracutdevs/dracut/pull/2196
# https://bugzilla.redhat.com/show_bug.cgi?id=2131852
Patch12: 0001-fix-make-iso-scan-trigger-udev-events.patch
BuildRequires: bash
BuildRequires: git-core
BuildRequires: pkgconfig(libkmod) >= 23
@ -474,6 +479,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
%changelog
* Thu Oct 05 2023 Adam Williamson <awilliam@redhat.com> - 059-14
- Backport PR #2196 to fix boot with iso-scan feature
* Wed Sep 20 2023 Pavel Valena <pvalena@redhat.com> - 059-13
- fix(dracut.spec): add jq dependency to network subpackage