(mirror of https://github.com/vyos/vyos-live-build.git) https://git.amelek.net/vyos/vyos-live-build.git/atom?h=cla 2020-05-04T21:15:09+00:00 2020-05-04T21:15:09+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-04T17:20:02+00:00 urn:sha1:a542d52141acef0e2d2bb78253d6b5df4305dcd1 when loopback support was introduced, it initially duplicated the code for generating a grub2 config, before the duplicated code was removed from the grub-pc script, effectively thus moving grub config generation to the loopback feature script. grub-efi support was added after this. this results in a misleading filename, since the `binary_loopback_cfg` script is essential for use of grub-pc|grub-efi, and actually only has a single line of code on top that's needed for adding actual loopback support on top. (when grub-pc and grub-efi are not used, the entire script is still needed for loopback support to work). so here we rename it to make better sense, and correct/clarify bits of documentation. Gbp-Dch: Short 2020-05-01T21:02:31+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-01T20:47:31+00:00 urn:sha1:6ebac9cc5b3f0c79d8225ed6617ba1c8859c703b 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 2020-05-01T09:40:40+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-26T04:59:15+00:00 urn:sha1:fd18d46e0eb6abfe757f8764c65ac4c472fcdeef instead of cramming the live entries into a string via a layer of functions for terminating entries with newlines, which we then have to run through perl to tweak the newlines for correct use with sed... let's write the entries to a temp file, then use that file in the sed replacement. the helper functions injecting newlines to the end of entries as they were built into a long string have obviously become unnecessary and so were removed. one function was renamed for reasons of consistency and clarity. the file is initially deleted before use for reasons of wanting to bullet proof the codebase to work properly under conditions of recovering from failure/cancellation, `--force` re-running and such. this removes the last use of perl. Gbp-Dch: Short 2020-04-30T10:57:47+00:00 Lyndon Brown jnqnfe@gmail.com 2020-04-30T10:57:47+00:00 urn:sha1:b4156e146f83474a9cb1aca9117a4a4053c62683 it reported: "possible bashism in scripts/build/binary_loopback_cfg line 284 (should be '.', not 'source')" which is clearly a misidentification. Gbp-Dch: Ignore 2020-04-30T06:10:08+00:00 Lyndon Brown jnqnfe@gmail.com 2020-04-30T05:55:34+00:00 urn:sha1:96ade65e65fb494a79400c0deaf8297c5b2ac46f partly lost in some adjustments that were made to the submitted work, which was focused on restoring the 'start installer' entry. there is no need for dynamic setting of these two `source` imports in the default file, in fact user modifications should also use the fixed import commands in future. note that the old placeholders however remain replaced, which inject precisely this string, for backwards compatibility. Gbp-Dch: Ignore 2020-04-29T19:08:39+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-25T01:56:17+00:00 urn:sha1:a8a6addaf5405ed68cc6132522f09aa6bf5079e5 Gbp-Dch: Ignore 2020-04-23T13:24:50+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-28T12:25:34+00:00 urn:sha1:1eee15e8527e0b85f00c946caf7fcb57579f2256 2020-04-23T08:18:41+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-25T22:11:07+00:00 urn:sha1:5ac625e3e16704a795be41b4b40ce0b1c1a5b1eb Gbp-Dch: Ignore 2020-04-23T07:59:56+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-25T02:59:44+00:00 urn:sha1:077d005a84f9c7b554889afcc196023bf829e86e backwards compatibility: 1. the new file will be included alongside any user custom config 2. rather than replace MEMTEST with an actual config entry, we replace it with a line to import the content of the new file, and thus will work just as before. thus no backwards compatible breakage Gbp-Dch: Short 2020-04-23T07:59:56+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-25T02:23:32+00:00 urn:sha1:69093d9e3b7ebc2d3691f683fd447653e211a654 backwards compatibility: 1. the new install.cfg and install_start.cfg files (chosen automatically from the install_*gui.cfg and install_*test.cfg files) will be included alongside any user custom config. 2. the placeholders are now replaced with lines importing these files thus everything will work just as before, i.e. no backwards compatibility breakage. Gbp-Dch: Short