diff --git a/srcpkgs/dracut/files/kernel-hook-postinst b/srcpkgs/dracut/files/kernel-hook-postinst index a9d265b6ed6..537af549796 100644 --- a/srcpkgs/dracut/files/kernel-hook-postinst +++ b/srcpkgs/dracut/files/kernel-hook-postinst @@ -7,9 +7,9 @@ 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} +usr/bin/dracut -q --force --sysroot . boot/initramfs-${VERSION}.img ${VERSION} exit $? diff --git a/srcpkgs/dracut/files/kernel-hook-postrm b/srcpkgs/dracut/files/kernel-hook-postrm index f99458a4bfa..c338cf617a7 100644 --- a/srcpkgs/dracut/files/kernel-hook-postrm +++ b/srcpkgs/dracut/files/kernel-hook-postrm @@ -7,7 +7,5 @@ PKGNAME="$1" VERSION="$2" -if [ -f boot/initramfs-${VERSION}.img ]; then - rm -f boot/initramfs-${VERSION}.img -fi +rm -f boot/initramfs-${VERSION}.img exit $? diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postinst b/srcpkgs/dracut/files/kernel-uefi-hook-postinst index d623c3f86df..f1098a48a81 100644 --- a/srcpkgs/dracut/files/kernel-uefi-hook-postinst +++ b/srcpkgs/dracut/files/kernel-uefi-hook-postinst @@ -12,12 +12,13 @@ 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 --sysroot . ${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..120efb1bd6e 100644 --- a/srcpkgs/dracut/files/kernel-uefi-hook-postrm +++ b/srcpkgs/dracut/files/kernel-uefi-hook-postrm @@ -11,7 +11,5 @@ 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 +rm -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" exit $? diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 8fb41d17a72..232f70a0d4a 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=050 -revision=5 +revision=6 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf"