From af4fda568788c131ce0a660dc40f621e2bbec3e1 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 29 Jul 2019 23:17:22 +0000
Subject: Mon Jul 29 23:17:22 UTC 2019

a/aaa_elflibs-15.0-x86_64-10.txz:  Rebuilt.
  Upgraded: libglib-2.0.so.0.6000.6, libgmodule-2.0.so.0.6000.6,
  libgobject-2.0.so.0.6000.6, libgthread-2.0.so.0.6000.6,
  liblber-2.4.so.2.10.11, libldap-2.4.so.2.10.11.
  Added: libargon2.so.1, libjson-c.so.4.0.0.
a/cryptsetup-2.1.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
  Thanks to Robby Workman.
a/efibootmgr-20190528_d9eb7f1-x86_64-1.txz:  Upgraded.
  Even though efibootmgr-17 will compile against efivar from git, it's probably
  best to take this from git as well to keep things closely synced.
a/efivar-20190618_272b216-x86_64-1.txz:  Upgraded.
  Switch to git to fix "efibootmgr -v" failing with a parse error.
a/elilo-3.16-x86_64-10.txz:  Rebuilt.
  eliloconfig: If /boot/initrd.gz exists, install the generic kernel and initrd.
  Otherwise, install the huge kernel.
a/lvm2-2.03.05-x86_64-1.txz:  Upgraded.
  Back to lvm2-2.03.x (cryptsetup needs it). Hopefully there's been enough time
  for most of the bugs to have been ironed out.
l/argon2-20190702-x86_64-3.txz:  Rebuilt.
  Fix shared library permissions.
l/aspell-0.60.7-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_57-x86_64-1.txz:  Upgraded.
l/python-docutils-0.15.1-x86_64-1.txz:  Upgraded.
n/ipset-7.3-x86_64-1.txz:  Upgraded.
xap/geeqie-1.5-x86_64-1.txz:  Upgraded.
xfce/garcon-0.6.4-x86_64-1.txz:  Upgraded.
xfce/thunar-volman-0.9.4-x86_64-1.txz:  Upgraded.
xfce/tumbler-0.2.6-x86_64-1.txz:  Upgraded.
---
 source/a/elilo/eliloconfig | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'source/a/elilo/eliloconfig')

diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig
index e1866859a..9d7475f9a 100644
--- a/source/a/elilo/eliloconfig
+++ b/source/a/elilo/eliloconfig
@@ -133,18 +133,23 @@ timeout=1
 #
 EOF
 cp -a $T_PX/boot/elilo-x86_64.efi $T_PX/boot/efi/EFI/Slackware/elilo.efi 1> /dev/null 2> /dev/null
-cp $T_PX/boot/vmlinuz $T_PX/boot/efi/EFI/Slackware 1> /dev/null 2> /dev/null
-cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
-image=vmlinuz
-        label=vmlinuz
-EOF
-touch -r $T_PX/boot/vmlinuz $T_PX/boot/efi/EFI/Slackware/vmlinuz
 if [ -r $T_PX/boot/initrd.gz ]; then
+  cp $T_PX/boot/vmlinuz-generic $T_PX/boot/efi/EFI/Slackware/vmlinuz 1> /dev/null 2> /dev/null
+  touch -r $T_PX/boot/vmlinuz-generic $T_PX/boot/efi/EFI/Slackware/vmlinuz
   cp $T_PX/boot/initrd.gz $T_PX/boot/efi/EFI/Slackware 1> /dev/null 2> /dev/null
   touch -r $T_PX/boot/initrd.gz $T_PX/boot/efi/EFI/Slackware/initrd.gz
   cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
+image=vmlinuz
+        label=vmlinuz
         initrd=initrd.gz
 EOF
+else
+  cp $T_PX/boot/vmlinuz-huge $T_PX/boot/efi/EFI/Slackware/vmlinuz 1> /dev/null 2> /dev/null
+  touch -r $T_PX/boot/vmlinuz-huge $T_PX/boot/efi/EFI/Slackware/vmlinuz
+  cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
+image=vmlinuz
+        label=vmlinuz
+EOF
 fi
 cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
         read-only
-- 
cgit v1.2.3-79-gdb01