From 6ebac9cc5b3f0c79d8225ed6617ba1c8859c703b Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Fri, 1 May 2020 21:47:31 +0100 Subject: grub2: fix duplicate live entries in tweaking a previous commit to remove some excessive change before submission, i mistakenly identified the part of the sed replacement restored here as being unnecessary to its functionality, but in fact it is. without it the placeholder is not actually removed. the lack of removal of the placeholder meant that you ended up with duplicate copies of the live menu entries. Gbp-Dch: Ignore --- scripts/build/binary_loopback_cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 09f94aca5..4f4e1b95d 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -192,8 +192,8 @@ if [ $_COUNT -gt 1 ]; then fi # Replace placeholder with compiled live entries temporarily held in live.cfg.tmp -sed -i -e "/@LINUX_LIVE@/ r ${LIVE_ENTRIES_TMP}" "${_TARGET}"/*.cfg -sed -i -e "/LINUX_LIVE/ r ${LIVE_ENTRIES_TMP}" "${_TARGET}"/*.cfg #backwards compatibility +sed -i -e "/@LINUX_LIVE@/r ${LIVE_ENTRIES_TMP}" -e "/@LINUX_LIVE@/d" "${_TARGET}"/*.cfg +sed -i -e "/LINUX_LIVE/r ${LIVE_ENTRIES_TMP}" -e "/LINUX_LIVE/d" "${_TARGET}"/*.cfg #backwards compatibility rm -f "${LIVE_ENTRIES_TMP}" # Assembling debian-installer configuration -- cgit v1.2.3