diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-01 21:47:31 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-01 22:02:31 +0100 |
| commit | 6ebac9cc5b3f0c79d8225ed6617ba1c8859c703b (patch) | |
| tree | 441a467c898b7cdaf56fa72e8b8b1a0d3352682b /scripts | |
| parent | 578dbee516a370935e1b2e49205c524370e1f8d0 (diff) | |
| download | vyos-live-build-6ebac9cc5b3f0c79d8225ed6617ba1c8859c703b.tar.gz vyos-live-build-6ebac9cc5b3f0c79d8225ed6617ba1c8859c703b.zip | |
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 4 |
1 files changed, 2 insertions, 2 deletions
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 |