jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dracut: in kernel hooks, use binary from target root

Browse source 
Closes: #24236 [via git-merge-pr]
This commit is contained in:
Andrew J. Hesford 2020-08-11 19:52:00 -04:00
parent d88554a2de
commit dda8f80545
5 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/dracut/files/kernel-hook-postinst
View file

@ -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}

5
srcpkgs/dracut/files/kernel-hook-postrm
View file

@ -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

6
srcpkgs/dracut/files/kernel-uefi-hook-postinst
View file

@ -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 $?

5
srcpkgs/dracut/files/kernel-uefi-hook-postrm
View file

@ -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"

2
srcpkgs/dracut/template
View file

@ -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"