snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

Revert "dracut: improve consistency of relative paths in kernel hooks" 

This reverts commit f34677f4a6.

Fixes #24128
This commit is contained in:
Piraty 2020-08-07 20:23:17 +02:00
parent bd846c70d2
commit 40860bd5d0
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcpkgs/dracut/files/kernel-hook-postinst
View File

@ -7,9 +7,9 @@
PKGNAME="$1" PKGNAME="$1"
VERSION="$2" VERSION="$2"
if [ ! -x usr/bin/dracut ]; then if [ ! -x bin/dracut ]; then
exit 0 exit 0
fi fi
usr/bin/dracut -q --force --sysroot . boot/initramfs-${VERSION}.img ${VERSION} dracut -q --force boot/initramfs-${VERSION}.img ${VERSION}
exit $? exit $?

4
srcpkgs/dracut/files/kernel-hook-postrm
View File

@ -7,5 +7,7 @@
PKGNAME="$1" PKGNAME="$1"
VERSION="$2" VERSION="$2"
rm -f boot/initramfs-${VERSION}.img if [ -f boot/initramfs-${VERSION}.img ]; then
rm -f boot/initramfs-${VERSION}.img
fi
exit $? exit $?

5
srcpkgs/dracut/files/kernel-uefi-hook-postinst
View File

@ -12,13 +12,12 @@ if [ -z "${CREATE_UEFI_BUNDLES}" ]; then
exit 0 exit 0
fi fi
if [ ! -x usr/bin/dracut ]; then if [ ! -x 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}
usr/bin/dracut -q --force --sysroot . ${DRACUT_OPTIONS} \ dracut -q --force ${KERNEL_CMDLINE:+--kernel-cmdline="${KERNEL_CMDLINE}"} ${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 $? exit $?

4
srcpkgs/dracut/files/kernel-uefi-hook-postrm
View File

@ -11,5 +11,7 @@ VERSION="$2"
: "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}" : "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}"
rm -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" if [ -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" ]; then
rm -fv "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
fi
exit $? exit $?

2
srcpkgs/dracut/template
View File

@ -1,7 +1,7 @@
# Template file for 'dracut' # Template file for 'dracut'
pkgname=dracut pkgname=dracut
version=050 version=050
revision=6 revision=7
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"