From 38af959aa5a93387085e1fb15fba69c801239aa1 Mon Sep 17 00:00:00 2001
From: jnqnfe <jnqnfe@gmail.com>
Date: Mon, 19 Jan 2015 02:36:13 +0000
Subject: [PATCH] syslinux: use more dynamic memtest menu config file

Fixes the following
 - Correct version (memtest86/memtest86+) shown instead of fixed 'memtest86+' text
 - Ensure correct directory path always used by using replaceable placeholder

Gbp-Dch: Short
---
 scripts/build/binary_syslinux          | 5 ++++-
 share/bootloaders/extlinux/memtest.cfg | 6 +++---
 share/bootloaders/isolinux/memtest.cfg | 6 +++---
 share/bootloaders/pxelinux/memtest.cfg | 6 +++---
 share/bootloaders/syslinux/memtest.cfg | 6 +++---
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 443d0133e..409ca2acc 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -266,6 +266,9 @@ do
 	fi
 done
 
+MEMTEST_PATH="${_INITRAMFS}/memtest"
+sed -i -e "s#@MEMTEST_VERSION@#${LB_MEMTEST}#g" -e "s#@MEMTEST@#/${MEMTEST_PATH}#g" "${_TARGET}"/memtest.cfg
+
 # Replace placeholder for optional install menu entries include
 if [ "${LB_DEBIAN_INSTALLER}" = "none" ]; then
 	rm -f "${_TARGET}"/install.cfg
@@ -275,7 +278,7 @@ else
 fi
 
 # Replace placeholder for optional memtest menu entry include
-if [ ! -f "binary/${_INITRAMFS}/memtest" ]; then
+if [ ! -f "binary/${MEMTEST_PATH}" ]; then
 	rm -f "${_TARGET}"/memtest.cfg
 	sed -i -e "#@OPTIONAL_MEMTEST_INCLUDE@#d" "${_TARGET}"/advanced.cfg
 else
diff --git a/share/bootloaders/extlinux/memtest.cfg b/share/bootloaders/extlinux/memtest.cfg
index e7e86e30b..99f4c33b1 100644
--- a/share/bootloaders/extlinux/memtest.cfg
+++ b/share/bootloaders/extlinux/memtest.cfg
@@ -1,4 +1,4 @@
 label memtest
-	menu label ^Memory Diagnostic Tool (memtest86+)
-	menu title Memory Diagnostic Tool (memtest86+)
-	linux /live/memtest
+	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	linux @MEMTEST@
diff --git a/share/bootloaders/isolinux/memtest.cfg b/share/bootloaders/isolinux/memtest.cfg
index e7e86e30b..99f4c33b1 100644
--- a/share/bootloaders/isolinux/memtest.cfg
+++ b/share/bootloaders/isolinux/memtest.cfg
@@ -1,4 +1,4 @@
 label memtest
-	menu label ^Memory Diagnostic Tool (memtest86+)
-	menu title Memory Diagnostic Tool (memtest86+)
-	linux /live/memtest
+	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	linux @MEMTEST@
diff --git a/share/bootloaders/pxelinux/memtest.cfg b/share/bootloaders/pxelinux/memtest.cfg
index e7e86e30b..99f4c33b1 100644
--- a/share/bootloaders/pxelinux/memtest.cfg
+++ b/share/bootloaders/pxelinux/memtest.cfg
@@ -1,4 +1,4 @@
 label memtest
-	menu label ^Memory Diagnostic Tool (memtest86+)
-	menu title Memory Diagnostic Tool (memtest86+)
-	linux /live/memtest
+	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	linux @MEMTEST@
diff --git a/share/bootloaders/syslinux/memtest.cfg b/share/bootloaders/syslinux/memtest.cfg
index e7e86e30b..99f4c33b1 100644
--- a/share/bootloaders/syslinux/memtest.cfg
+++ b/share/bootloaders/syslinux/memtest.cfg
@@ -1,4 +1,4 @@
 label memtest
-	menu label ^Memory Diagnostic Tool (memtest86+)
-	menu title Memory Diagnostic Tool (memtest86+)
-	linux /live/memtest
+	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
+	linux @MEMTEST@