From 1f1b156697154179cdc0b8d95452b2f22c67eb9f Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu, 26 Mar 2020 05:21:28 +0000
Subject: grub2|loopback: move copying of files earlier

necessary for changes in followup commits.

Gbp-Dch: Short
---
 scripts/build/binary_loopback_cfg | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 1eccbd70f..113fd7be0 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -129,10 +129,15 @@ END
 # User config replacement/additional files
 _SOURCE_USER="config/bootloaders/grub-pc"
 
+# Copying templates
+mkdir -p binary/boot/grub
 if [ -n "${LIVE_BUILD}" ]; then
-	_SOURCE="${LIVE_BUILD}/share/bootloaders/grub-pc"
+	cp -a "${LIVE_BUILD}/share/bootloaders/grub-pc"/* binary/boot/grub/
 else
-	_SOURCE="/usr/share/live/build/bootloaders/grub-pc"
+	cp -a "/usr/share/live/build/bootloaders/grub-pc"/* binary/boot/grub/
+fi
+if [ -e "${_SOURCE_USER}" ]; then
+	cp -af "${_SOURCE_USER}"/* binary/boot/grub/
 fi
 
 case "${LB_INITRAMFS}" in
@@ -269,13 +274,6 @@ then
 	MEMTEST="$(Grub_memtest_menu_entry)$NL"
 fi
 
-# Copying templates
-mkdir -p binary/boot/grub
-cp -a "${_SOURCE}"/* binary/boot/grub/
-if [ -e "${_SOURCE_USER}" ]; then
-	cp -af "${_SOURCE_USER}"/* binary/boot/grub/
-fi
-
 escape_for_sed() {
 	echo -n "$1" | perl -npe 's/\n/\\n/gm'
 }
-- 
cgit v1.2.3