From 669fad3aae10be3fd0afc87704a296df63d788a1 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 10 May 2017 12:26:32 +0200
Subject: In -current the hardcoded /mnt in initrd and eliloconfig was fixed

Therefore we need to update the way we patch eliloconfig in -current
and the installer scripts.  Patching is still needed for Slackware 14.2.
---
 make_slackware_live.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index c8bff5e..d7e91e7 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1399,7 +1399,8 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then
     rm -r usr sbin
     rm -f setup
   cd - 1>/dev/null
-  # Fix some occurrences of '/mnt' that should not be used in the Live ISO:
+  # Fix some occurrences of '/mnt' that should not be used in the Live ISO
+  # (this was applied in Slackware > 14.2 but does not harm to do this anyway):
   sed -i ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* \
     -e 's,T_PX=/mnt,T_PX="`cat $TMP/SeTT_PX`",g' \
     -e 's, /mnt, ${T_PX},g' \
@@ -1421,18 +1422,26 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then
   if [ -f ${LIVE_ROOTDIR}/sbin/liloconfig ]; then
     if [ -f ${LIVE_TOOLDIR}/patches/liloconfig_${SL_VERSION}.patch ]; then
       LILOPATCH=liloconfig_${SL_VERSION}.patch
-    else
+    elif [ -f ${LIVE_TOOLDIR}/patches/liloconfig.patch ]; then
       LILOPATCH=liloconfig.patch
+    else
+      LILOPATCH=""
+    fi
+    if [ -n "${LILOPATCH}" ]; then
+      patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/${LILOPATCH}
     fi
-    patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/${LILOPATCH}
   fi
   if [ -f ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ]; then
     if [ -f ${LIVE_TOOLDIR}/patches/eliloconfig_${SL_VERSION}.patch ]; then
       ELILOPATCH=eliloconfig_${SL_VERSION}.patch
-    else
+    elif  [ -f ${LIVE_TOOLDIR}/patches/eliloconfig.patch ]; then
       ELILOPATCH=eliloconfig.patch
+    else
+      ELILOPATCH=""
+    fi
+    if [ -n "${ELILOPATCH}" ]; then
+      patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/${ELILOPATCH}
     fi
-    patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/${ELILOPATCH}
   fi
   # Fix some occurrences of '/usr/lib/setup/' that are covered by $PATH:
   sed -i -e 's,/usr/lib/setup/,,g' -e 's,:/usr/lib/setup,:/usr/share/${LIVEMAIN},g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/*
-- 
cgit v1.2.3