mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 23:53:51 +02:00
dracut: in kernel hooks, use binary from target root
Closes: #24236 [via git-merge-pr]
This commit is contained in:
parent
d88554a2de
commit
dda8f80545
5 changed files with 8 additions and 15 deletions
|
@ -7,9 +7,8 @@
|
||||||
PKGNAME="$1"
|
PKGNAME="$1"
|
||||||
VERSION="$2"
|
VERSION="$2"
|
||||||
|
|
||||||
if [ ! -x bin/dracut ]; then
|
if [ ! -x usr/bin/dracut ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dracut -q --force boot/initramfs-${VERSION}.img ${VERSION}
|
usr/bin/dracut -q --force boot/initramfs-${VERSION}.img ${VERSION}
|
||||||
exit $?
|
|
||||||
|
|
|
@ -7,7 +7,4 @@
|
||||||
PKGNAME="$1"
|
PKGNAME="$1"
|
||||||
VERSION="$2"
|
VERSION="$2"
|
||||||
|
|
||||||
if [ -f boot/initramfs-${VERSION}.img ]; then
|
rm -f boot/initramfs-${VERSION}.img
|
||||||
rm -f boot/initramfs-${VERSION}.img
|
|
||||||
fi
|
|
||||||
exit $?
|
|
||||||
|
|
|
@ -12,12 +12,12 @@ if [ -z "${CREATE_UEFI_BUNDLES}" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -x bin/dracut ]; then
|
if [ ! -x usr/bin/dracut ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p ${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}
|
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}
|
--uefi ${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi ${VERSION}
|
||||||
exit $?
|
|
||||||
|
|
|
@ -11,7 +11,4 @@ VERSION="$2"
|
||||||
|
|
||||||
: "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}"
|
: "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}"
|
||||||
|
|
||||||
if [ -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" ]; then
|
rm -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
|
||||||
rm -fv "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
|
|
||||||
fi
|
|
||||||
exit $?
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'dracut'
|
# Template file for 'dracut'
|
||||||
pkgname=dracut
|
pkgname=dracut
|
||||||
version=050
|
version=050
|
||||||
revision=7
|
revision=8
|
||||||
build_style=configure
|
build_style=configure
|
||||||
configure_args="--prefix=/usr --sysconfdir=/etc"
|
configure_args="--prefix=/usr --sysconfdir=/etc"
|
||||||
conf_files="/etc/dracut.conf"
|
conf_files="/etc/dracut.conf"
|
||||||
|
|
Loading…
Add table
Reference in a new issue