diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-07-20 00:45:49 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-07-20 00:45:49 +0000 |
| commit | 462a350678cbee57e9baa25152bc7de7379f4962 (patch) | |
| tree | 340106b9e56368f5c7447e30d7e979268557480e /user/grub | |
| parent | 3e0ffda88c14c8e19ba72c0135ee049c0fa375c8 (diff) | |
| parent | 77a32d089abcb5f43da122e4b97575e671213457 (diff) | |
| download | packages-462a350678cbee57e9baa25152bc7de7379f4962.tar.gz packages-462a350678cbee57e9baa25152bc7de7379f4962.tar.bz2 packages-462a350678cbee57e9baa25152bc7de7379f4962.tar.xz packages-462a350678cbee57e9baa25152bc7de7379f4962.zip | |
Merge branch 'new/easy-boot' into 'master'
Adjust existing boot-related triggers and add one for dracut
See merge request adelie/packages!485
Diffstat (limited to 'user/grub')
| -rw-r--r-- | user/grub/APKBUILD | 7 | ||||
| -rw-r--r-- | user/grub/grub.trigger | 2 |
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 |