[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e3ae3cac3825f290b2eca2f7e7d85c235e3e8d4e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 04:00:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:13:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e3ae3cac

gen_bootloader.sh: Recognize set kernel/initramfs name for grub legacy

Fixes 769a07fd ("Make initramfs and kernel filename customizable")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_bootloader.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 9178d00..68eb721 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -129,14 +129,14 @@ set_bootloader_grub() {
 }
 
 set_bootloader_grub_duplicate_default_replace_kernel_initrd() {
-       sed -r -e 
"/^[[:space:]]*kernel/s/kernel-[[:alnum:][:punct:]]+/${GK_FILENAME_KERNEL}/" - |
-       sed -r -e 
"/^[[:space:]]*initrd/s/init(rd|ramfs)-[[:alnum:][:punct:]]+/${GK_FILENAME_INITRAMFS}/"
+       sed -r -e 
"s/(^[[:space:]]*kernel[[:space:]=]*\/)(${GK_FILENAME_KERNEL%%-*}|${GK_FILENAME_KERNEL_SYMLINK%%-*}|kernel)(-[[:alnum:][:punct:]]+)?/\1${GK_FILENAME_KERNEL}/"
 - |
+       sed -r -e 
"s/(^[[:space:]]*initrd[[:space:]=]*\/)(${GK_FILENAME_INITRAMFS%%-*}|${GK_FILENAME_INITRAMFS_SYMLINK%%-*}|initrd|initramfs)(-[[:alnum:][:punct:]]+)?/\1${GK_FILENAME_INITRAMFS}/"
 }
 
 set_bootloader_grub_check_for_existing_entry() {
        local GRUB_CONF=$1
-       if grep -q 
"^[[:space:]]*kernel[[:space:]=]*.*/${GK_FILENAME_KERNEL}\([[:space:]]\|$\)" 
"${GRUB_CONF}" &&
-               grep -q 
"^[[:space:]]*initrd[[:space:]=]*.*/${GK_FILENAME_INITRAMFS}\([[:space:]]\|$\)" 
"${GRUB_CONF}"
+       if grep -q 
"^[[:space:]]*kernel[[:space:]=]*/${GK_FILENAME_KERNEL}\([[:space:]]\|$\)" 
"${GRUB_CONF}" &&
+               grep -q 
"^[[:space:]]*initrd[[:space:]=]*/${GK_FILENAME_INITRAMFS}\([[:space:]]\|$\)" 
"${GRUB_CONF}"
        then
                return 0
        fi