From fadee571ce5aa33d9701f062cf4ba355a3975dca Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 17 Jan 2019 20:42:43 +0000
Subject: [PATCH] main/grub: generate grub.cfg from trigger

call grub-mkconfig from trigger to generate config
---
 main/grub/APKBUILD     |  2 +-
 main/grub/grub.trigger | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index c01f7ebfc19c..b15f4a1d050a 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 004b84e5fcca..747f7950db46 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
+
-- 
GitLab