(mirror of https://github.com/vyos/vyos-live-build.git) https://git.amelek.net/vyos/vyos-live-build.git/atom?h=current 2020-04-24T17:50:37+00:00 2020-04-24T17:50:37+00:00 jnqnfe jnqnfe@gmail.com 2015-02-03T18:52:30+00:00 urn:sha1:24c2b3e119ef1b22539736ddaae1f42818c09f02 there are several files of which identical duplicate copies are held in: - share/bootloaders/extlinux - share/bootloaders/pxelinux - share/bootloaders/isolinux - share/bootloaders/syslinux it is a pain to maintain this from a development standpoint, having to copy modified config files into the other directories each time changes are made and mistakes have been made before due to this. this creates a new folder share/bootloaders/syslinux_common and moves them to this new directory. it also expands the binary_syslinux stage to use it, with it now constructing the installed set of bootloader files as follows: 1. copy {LB_DIR}/bootloaders/syslinux_common 2. copy {LB_DIR}/bootloaders/{syslinux|isolinux|extlinux|pxelinux} on top 3. copy config/bootloaders/syslinux_common on top 4. copy config/bootloaders/{syslinux|isolinux|extlinux|pxelinux} on top note, to explain part of the binary_syslinux change, instead of just copying the correct bootloader folder full of the files, we now make the target bootloader specific directory, then copy the contents of source directories into it. Gbp-Dch: Short 2020-04-24T16:57:03+00:00 Raphaël Hertzog hertzog@debian.org 2020-04-24T15:56:22+00:00 urn:sha1:34a72caf494b2b4b98248ce4d54e0654dc822890 * Use same menu labels * Use same hotkeys * Get rid of a nested menu that is not present in grub * Add "menu title" statement to hide the caret of the hotkey (^) 2020-04-24T15:38:55+00:00 Lyndon Brown jnqnfe@gmail.com 2020-04-24T14:51:49+00:00 urn:sha1:47b0a623dd4ec320371508e1a0c3deaff973efd3 0bf9d2d390e2d031ebe344050d8766ba7cd9ad54 expanded the set of install options, whilst also moving them all to a submenu. it has since been raised that this is not actually what is wanted, that having an entry for the most common install option is wanted at the top level, like currently with grub2. this adds such an entry. Gbp-Dch: Short 2020-04-24T14:43:20+00:00 Lyndon Brown jnqnfe@gmail.com 2020-04-04T05:01:23+00:00 urn:sha1:41ca745b6cf8b506408082453cbabd0616a62d44 for some reason the syslinux folder one had these but not the others. probably a result of having four separate copies of the files and this part of the past change to expand the install menus failed to be duplicated. Gbp-Dch: Short 2020-04-23T15:51:57+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-26T03:16:20+00:00 urn:sha1:49794f118f55570bbccbef649bbf941bbc091ee3 enabling improved flexibility for any possible future path changes. Gbp-Dch: Ignore 2020-03-25T01:25:50+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-25T00:01:46+00:00 urn:sha1:8775c8075c657b820ae35f068f7253cbe7b10d74 this reverts commit 0cef87ffca0e9d89ac1f8e0098f890f2eefd3559 though retaining the 'advanced options' menu entry using a label rather than a title. despite having done a lot of testing back in 2015 with my bootloader improvements, i notice now that in fact the syslinux caret fix has an undesired side effect of modifying the title displayed above the menus. it does not help that the text embedded into the splash overlaps with this menu title; perhaps this explains why i missed this problem back in 2015. purely reverting the implemented fix solves this title problem, but restores the caret problem to the advanced options menu (in menu.cfg); however that menu was using a caret in a title entry, unlike everywhere else where they are only used with labels, which must have been the original source of the problem all along. ensuring that this menu uses a label instead of a title in this reversion leaves everything working correctly afaict. Gbp-Dch: Ignore 2020-03-22T19:43:56+00:00 jnqnfe jnqnfe@gmail.com 2015-01-28T04:19:36+00:00 urn:sha1:a25b77e0998ac455b48c8c523a08bd282229fb49 d-i removed this in commit 0917b2dde3ff73a204d27dd2f2fffc8a41175ddd Note: There was inconsistency between grub and syslinux in use of this, with syslinux not having it on graphical rescue and auto modes while grub entries did. The patch to fix that has been dropped since we're removing it everywhere anyway. (#395040) Gbp-Dch: Short 2020-03-16T23:08:26+00:00 jnqnfe jnqnfe@gmail.com 2015-01-19T02:36:13+00:00 urn:sha1:38af959aa5a93387085e1fb15fba69c801239aa1 Fixes the following - Correct version (memtest86/memtest86+) shown instead of fixed 'memtest86+' text - Ensure correct directory path always used by using replaceable placeholder Gbp-Dch: Short 2020-03-16T23:08:26+00:00 jnqnfe jnqnfe@gmail.com 2015-01-15T03:39:00+00:00 urn:sha1:31fa6abd3698453a759e56164fb09a53f6870ad1 2020-03-16T23:08:26+00:00 jnqnfe jnqnfe@gmail.com 2015-01-15T04:41:16+00:00 urn:sha1:7ffd2288d944840937f556bd56703ba381f4edcc