From f77034606e7b291b9a0824f105aa76be64ec7cbc Mon Sep 17 00:00:00 2001
From: Adrian Gibanel Lopez <adrian.gibanel@btactic.com>
Date: Fri, 15 Dec 2017 18:27:48 +0000
Subject: Updated binary_loopback_cfg so that it uses Stretch's 686 kernel
 instead of old 486 one.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[hertzog@debian.org:
Also rename the variables for consistency.
]

Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
---
 debian/changelog                  |  8 ++++++++
 scripts/build/binary_loopback_cfg | 24 ++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7ed0d16b..f2e6488b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+live-build (1:20171208) UNRELEASED; urgency=medium
+
+  * Restore i386/amd64 autodetection in grub after rename of
+    i386 kernel from -486 to -686. Closes: #884585
+    Thanks to Adrian Gibanel Lopez for the patch.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Thu, 21 Dec 2017 14:14:04 +0100
+
 live-build (1:20171207) unstable; urgency=medium
 
   * Use $SOURCE_DATE_EPOCH when updating timestamps of manual pages in order
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 00f537c48..2e6787a72 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -99,8 +99,8 @@ Grub_live_autodetect_menu_entry ()
 	local LABEL="${1}"
 	local AMD64_KERNEL="${2}"
 	local AMD64_INITRD="${3}"
-	local _486_KERNEL="${4}"
-	local _486_INITRD="${5}"
+	local _686_KERNEL="${4}"
+	local _686_INITRD="${5}"
 	local APPEND="${6}"
 	cat <<END
 # Autodetect if amd64 is supported
@@ -109,8 +109,8 @@ menuentry "$LABEL" {
 		linux ${AMD64_KERNEL} ${APPEND}
 		initrd ${AMD64_INITRD}
 	else
-		linux ${_486_KERNEL} ${APPEND}
-		initrd ${_486_INITRD}
+		linux ${_686_KERNEL} ${APPEND}
+		initrd ${_686_INITRD}
 	fi
 }
 END
@@ -178,27 +178,27 @@ INITRD_LIVE="/${INITFS}/${DEFAULT_INITRD}"
 APPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
 
 # Assembling kernel configuration
-_AMD64_486_NUMBER="0"
+_AMD64_686_NUMBER="0"
 
 for _FLAVOUR in ${LB_LINUX_FLAVOURS}
 do
-	if [ "${_FLAVOUR}" = "amd64" -o "${_FLAVOUR}" = "486" ] ; then
-		_AMD64_486_NUMBER="$((${_AMD64_486_NUMBER} + 1))"
+	if [ "${_FLAVOUR}" = "amd64" -o "${_FLAVOUR}" = "686" ] ; then
+		_AMD64_686_NUMBER="$((${_AMD64_686_NUMBER} + 1))"
 	fi
 done
 
-if [ "${_AMD64_486_NUMBER}" -ge 2 ] ; then
+if [ "${_AMD64_686_NUMBER}" -ge 2 ] ; then
 	# Default entries
 	AMD64_KERNEL="$(basename chroot/boot/vmlinuz-*amd64)"
 	AMD64_INITRD="initrd.img-$(echo ${AMD64_KERNEL} | sed -e 's|vmlinuz-||')"
-	_486_KERNEL="$(basename chroot/boot/vmlinuz-*486)"
-	_486_INITRD="initrd.img-$(echo ${_486_KERNEL} | sed -e 's|vmlinuz-||')"
+	_686_KERNEL="$(basename chroot/boot/vmlinuz-*686)"
+	_686_INITRD="initrd.img-$(echo ${_686_KERNEL} | sed -e 's|vmlinuz-||')"
 
 	Grub_live_autodetect_entry "Live system (autodetect)" \
 		"/${INITFS}/${AMD64_KERNEL}" \
 		"/${INITFS}/${AMD64_INITRD}" \
-		"/${INITFS}/${_486_KERNEL}" \
-		"/${INITFS}/${_486_INITRD}" \
+		"/${INITFS}/${_686_KERNEL}" \
+		"/${INITFS}/${_686_INITRD}" \
 		"$APPEND_LIVE"
 else
 	Grub_live_entry "Live system" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${APPEND_LIVE}"
-- 
cgit v1.2.3