From: 0x5c <0x5c@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dracut: backport fix for live images on linux 5.19+
Date: Tue, 14 Feb 2023 21:40:18 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42265@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]
There is a new pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages fix/dracut-isoscan
https://github.com/void-linux/void-packages/pull/42265
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
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42265.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/dracut-isoscan-42265.patch --]
[-- Type: text/x-diff, Size: 2343 bytes --]
From e1d3ef006d722cab1122fedc9a144713a35c5605 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
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 <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 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"
next reply other threads:[~2023-02-14 20:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 20:40 0x5c [this message]
2023-02-14 21:13 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42265@inbox.vuxu.org \
--to=0x5c@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).