From 40a076bf350b38888d8fd45c1d722b4351c84612 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu, 26 Mar 2020 05:42:11 +0000
Subject: grub2|loopback: use '@' bookended placeholders

...for consistency with syslinux config placeholders and improved
clarity of what text is a placeholder.

the old placeholders without the bookends are still replaced for
user configs for backwards compatibility.

the new ones are little used just at the moment but are expected to
become used much more in later commits.

Gbp-Dch: Short
---
 scripts/build/binary_loopback_cfg | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'scripts/build/binary_loopback_cfg')

diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 9c84e2b18..fbf893a53 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -276,10 +276,27 @@ escape_for_sed() {
 	echo -n "$1" | perl -npe 's/\n/\\n/gm'
 }
 
+# Those without '@' markers are for backwards compatibility
 sed -i \
+    -e "s|@LINUX_LIVE@|$(escape_for_sed "${LINUX_LIVE}")|" \
+    -e "s|@LINUX_INSTALL@|$(escape_for_sed "${LINUX_INSTALL}")|" \
+    -e "s|@LINUX_ADVANCED_INSTALL@|$(escape_for_sed "${LINUX_ADVANCED_INSTALL}")|" \
+    -e "s|@MEMTEST@|$(escape_for_sed "${MEMTEST}")|" \
+    -e "s|@KERNEL_GI@|${KERNEL_GI}|" \
+    -e "s|@INITRD_GI@|${INITRD_GI}|" \
+    -e "s|@APPEND_GI@|${APPEND_GI}|" \
+    -e "s|@KERNEL_DI@|${KERNEL_DI}|" \
+    -e "s|@INITRD_DI@|${INITRD_DI}|" \
+    -e "s|@APPEND_DI@|${APPEND_DI}|" \
+    -e "s|@KERNEL_LIVE@|${KERNEL_LIVE}|" \
+    -e "s|@INITRD_LIVE@|${INITRD_LIVE}|" \
+    -e "s|@APPEND_LIVE@|${APPEND_LIVE}|" \
+    -e "s|@LB_BOOTAPPEND_INSTALL@|${LB_BOOTAPPEND_INSTALL}|" \
+    -e "s|@LB_BOOTAPPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|" \
+    -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|" \
     -e "s|LINUX_LIVE|$(escape_for_sed "${LINUX_LIVE}")|" \
-    -e "s|LINUX_ADVANCED_INSTALL|$(escape_for_sed "${LINUX_ADVANCED_INSTALL}")|" \
     -e "s|LINUX_INSTALL|$(escape_for_sed "${LINUX_INSTALL}")|" \
+    -e "s|LINUX_ADVANCED_INSTALL|$(escape_for_sed "${LINUX_ADVANCED_INSTALL}")|" \
     -e "s|MEMTEST|$(escape_for_sed "${MEMTEST}")|" \
     -e "s|KERNEL_GI|${KERNEL_GI}|" \
     -e "s|INITRD_GI|${INITRD_GI}|" \
-- 
cgit v1.2.3