From e1d3ef006d722cab1122fedc9a144713a35c5605 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Tue, 14 Feb 2023 15:26:13 -0500 Subject: [PATCH] dracut: backport fix for live images on linux 5.19+ This fixes a bug in the live images when booted from grub as loopback (https://github.com/void-linux/void-mklive/issues/294). https://github.com/dracutdevs/dracut/issues/2183 https://github.com/dracutdevs/dracut/pull/2196 --- .../dracut/patches/isoscan-udev-trigger.patch | 25 +++++++++++++++++++ srcpkgs/dracut/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch new file mode 100644 index 000000000000..b80e966266b4 --- /dev/null +++ b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch @@ -0,0 +1,25 @@ +This upstream accepted patch fixes a bug where the live images don't work when +booted from grub loopback (void-linux/void-mklive#294). + +From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001 +From: 0x5c +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 886d23033..fa06b33cd 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 diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index d706e9199316..52a0c38c91c8 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=059 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf"