summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-07-10 23:56:31 -0500
committerMax Rees <maxcrees@me.com>2020-07-11 11:40:08 -0500
commit16126faa2815b13859fc878b387286b01a3bb85a (patch)
tree3b2dd0dd6c26dbb7d3910cdaf24ced3354f3a177
parent4d512ba839512055558fd0724a3ab4578e713d8f (diff)
downloadpackages-16126faa2815b13859fc878b387286b01a3bb85a.tar.gz
packages-16126faa2815b13859fc878b387286b01a3bb85a.tar.bz2
packages-16126faa2815b13859fc878b387286b01a3bb85a.tar.xz
packages-16126faa2815b13859fc878b387286b01a3bb85a.zip
user/grub: move trigger to easy-boot.d
-rw-r--r--user/grub/APKBUILD7
-rw-r--r--user/grub/grub.trigger2
2 files changed, 5 insertions, 4 deletions
diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD
index 2c0cfdbc9..66488715d 100644
--- a/user/grub/APKBUILD
+++ b/user/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=grub
pkgver=2.04
-pkgrel=3
+pkgrel=4
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -31,7 +31,6 @@ for f in $flavors; do
done
install="$pkgname.post-upgrade"
-triggers="$pkgname.trigger=/boot"
source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
adelie-branding.patch
@@ -134,6 +133,10 @@ package() {
install -Dm755 "$i" \
"$pkgdir"/etc/grub-quirks.d/"${i##"$srcdir"/quirk-}"
done
+
+ mkdir -p "$pkgdir"/etc/easy-boot.d
+ ln -s ../../usr/sbin/update-grub \
+ "$pkgdir"/etc/easy-boot.d/50-grub
}
bios() {
diff --git a/user/grub/grub.trigger b/user/grub/grub.trigger
deleted file mode 100644
index eba13a458..000000000
--- a/user/grub/grub.trigger
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-exec update-grub