aboutsummaryrefslogtreecommitdiffstats
path: root/main/grub
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-01-17 20:42:43 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-01-17 20:42:43 +0000
commitfadee571ce5aa33d9701f062cf4ba355a3975dca (patch)
tree2262faaa50f21f3da9472872f0f510a2cefcb50d /main/grub
parentcb6c7c4b66dc4640425f875c7d9545dad9e7823c (diff)
downloadaports-fadee571ce5aa33d9701f062cf4ba355a3975dca.tar.bz2
aports-fadee571ce5aa33d9701f062cf4ba355a3975dca.tar.xz
main/grub: generate grub.cfg from trigger
call grub-mkconfig from trigger to generate config
Diffstat (limited to 'main/grub')
-rw-r--r--main/grub/APKBUILD2
-rw-r--r--main/grub/grub.trigger11
2 files changed, 5 insertions, 8 deletions
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index c01f7ebfc1..b15f4a1d05 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.02
-pkgrel=9
+pkgrel=10
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
diff --git a/main/grub/grub.trigger b/main/grub/grub.trigger
index 004b84e5fc..747f7950db 100644
--- a/main/grub/grub.trigger
+++ b/main/grub/grub.trigger
@@ -1,10 +1,7 @@
#!/bin/sh
if [ -e /boot/grub/grub.cfg ]; then
- if [ -e /boot/vmlinuz-vanilla ]; then
- sed -i -e "s/vmlinuz /vmlinuz-vanilla /g" /boot/grub/grub.cfg
- else
- if [ -e /boot/vmlinuz ]; then
- sed -i -e "s/vmlinuz-vanilla/vmlinuz/g" /boot/grub/grub.cfg
- fi
- fi
+ cp /boot/grub/grub.cfg /boot/grub/grub.cfg.backup
fi
+grub-mkconfig -o /boot/grub/grub.cfg.new \
+ && mv /boot/grub/grub.cfg.new /boot/grub/grub.cfg
+