From f42eb5d03f856af2cf57ef0c637ebd0476237a5b Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 9 May 2017 21:12:17 +0200
Subject: eliloconfig patch needs to be made release-specific

The script started to diverge in -current,
and the patch would no longer apply.
---
 patches/eliloconfig_current.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 patches/eliloconfig_current.patch

(limited to 'patches/eliloconfig_current.patch')

diff --git a/patches/eliloconfig_current.patch b/patches/eliloconfig_current.patch
new file mode 100644
index 0000000..0f1f7db
--- /dev/null
+++ b/patches/eliloconfig_current.patch
@@ -0,0 +1,25 @@
+--- eliloconfig.orig	2017-05-04 23:26:50.000000000 +0200
++++ eliloconfig	2017-05-09 20:58:13.801898765 +0200
+@@ -75,9 +75,9 @@
+   exit
+ fi
+ 
+-# If there's no vfat mounted on /boot/efi or /mnt/boot/efi, forget it:
++# If there's no vfat mounted on /boot/efi or $T_PX/boot/efi, forget it:
+ if ! mount | grep vfat | grep -wq /boot/efi ; then
+-  if ! mount | grep vfat | grep -wq /mnt/boot/efi ; then
++  if ! mount | grep vfat | grep -wq $T_PX/boot/efi ; then
+     if [ "$T_PX" = "/" ]; then
+       echo "ERROR:  No EFI System Partition mounted on /boot/efi."
+     fi
+@@ -94,8 +94,8 @@
+   EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z])
+ else
+   mount | grep vfat | grep -w /mnt/boot/efi|grep -q nvme && DEVLEN=12 && PARTLEN=14
+-  EFI_DEVICE=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -b 1-${DEVLEN})
+-  EFI_PARTITION=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z])
++  EFI_DEVICE=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -b 1-${DEVLEN})
++  EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z])
+ fi
+ 
+ # There better be a kernel:
-- 
cgit v1.2.3