From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dracut: in kernel hooks, use binary from target root
Date: Wed, 12 Aug 2020 02:22:49 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24236@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages dracut
https://github.com/void-linux/void-packages/pull/24236
dracut: in kernel hooks, use binary from target root
This restores some of the hook changes from the problematic `050_6` bump, but omits the `--sysroot` argument that caused the issues in the first place.
Verified on my local system, but I'd like to get another tester just in case.
A patch file from https://github.com/void-linux/void-packages/pull/24236.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-24236.patch --]
[-- Type: text/x-diff, Size: 3058 bytes --]
From 6fc5b0ec02eb99a284339aa1c874b359cb1b725e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 Aug 2020 19:52:00 -0400
Subject: [PATCH] dracut: in kernel hooks, use binary from target root
---
srcpkgs/dracut/files/kernel-hook-postinst | 5 ++---
srcpkgs/dracut/files/kernel-hook-postrm | 5 +----
srcpkgs/dracut/files/kernel-uefi-hook-postinst | 6 +++---
srcpkgs/dracut/files/kernel-uefi-hook-postrm | 5 +----
srcpkgs/dracut/template | 2 +-
5 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/dracut/files/kernel-hook-postinst b/srcpkgs/dracut/files/kernel-hook-postinst
index a9d265b6ed6..fe2072e986d 100644
--- a/srcpkgs/dracut/files/kernel-hook-postinst
+++ b/srcpkgs/dracut/files/kernel-hook-postinst
@@ -7,9 +7,8 @@
PKGNAME="$1"
VERSION="$2"
-if [ ! -x bin/dracut ]; then
+if [ ! -x usr/bin/dracut ]; then
exit 0
fi
-dracut -q --force boot/initramfs-${VERSION}.img ${VERSION}
-exit $?
+usr/bin/dracut -q --force boot/initramfs-${VERSION}.img ${VERSION}
diff --git a/srcpkgs/dracut/files/kernel-hook-postrm b/srcpkgs/dracut/files/kernel-hook-postrm
index f99458a4bfa..963a72e0b4e 100644
--- a/srcpkgs/dracut/files/kernel-hook-postrm
+++ b/srcpkgs/dracut/files/kernel-hook-postrm
@@ -7,7 +7,4 @@
PKGNAME="$1"
VERSION="$2"
-if [ -f boot/initramfs-${VERSION}.img ]; then
- rm -f boot/initramfs-${VERSION}.img
-fi
-exit $?
+rm -f boot/initramfs-${VERSION}.img
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postinst b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
index d623c3f86df..153db79eb0f 100644
--- a/srcpkgs/dracut/files/kernel-uefi-hook-postinst
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
@@ -12,12 +12,12 @@ if [ -z "${CREATE_UEFI_BUNDLES}" ]; then
exit 0
fi
-if [ ! -x bin/dracut ]; then
+if [ ! -x usr/bin/dracut ]; then
exit 0
fi
mkdir -p ${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}
-dracut -q --force ${KERNEL_CMDLINE:+--kernel-cmdline="${KERNEL_CMDLINE}"} ${DRACUT_OPTIONS} \
+usr/bin/dracut -q --force ${DRACUT_OPTIONS} \
+ ${KERNEL_CMDLINE:+--kernel-cmdline="${KERNEL_CMDLINE}"} \
--uefi ${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi ${VERSION}
-exit $?
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postrm b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
index 8183bb26f08..1c6996bae88 100644
--- a/srcpkgs/dracut/files/kernel-uefi-hook-postrm
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
@@ -11,7 +11,4 @@ VERSION="$2"
: "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}"
-if [ -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" ]; then
- rm -fv "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
-fi
-exit $?
+rm -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index d08876b935f..f4f52be097a 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=050
-revision=7
+revision=8
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
next reply other threads:[~2020-08-12 0:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 0:22 ahesford [this message]
2020-08-12 2:35 ` ericonr
2020-08-14 18:40 ` [PR PATCH] [Closed]: " ahesford
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-24236@inbox.vuxu.org \
--to=ahesford@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).