summaryrefslogtreecommitdiff
path: root/share/bootloaders
AgeCommit message (Collapse)Author
2021-01-01Bugfix: Fix grub.cfg pc/ENABLE_MEMTEST checkRyan Finnie
Grub [ uses "-a", not "&&".
2020-10-12grub-efi: Show fwsetup, do not show incompatible memtest even if enabledRyan Finnie
2020-05-15bootloaders: reorganise installer menu entriesLyndon Brown
per layout from MR #199 discussion. under "Advanced install options" we have: - Graphical installer - Text installer - Graphical installer with dark theme - Text installer with dark theme - Installer with speech synthesis under each of these we have a set of: - Install - Expert install - Automated install - Rescue mode note that the 'automated' entries are moved up before the 'rescue' entries. for hotkeys, the four entries above have hotkeys of 'i', 'x', 'a', and 'r' respectively. ('x' is used instead of 'e' to avoid clash with standard grub hotkey). this means that some entries that previous had no hotkeys due to the flat list now have them. the other big difference is the main graphical install entry going from 'g' to 'i' for consistency and the main speech synth entry going from 's' to 'i' for the same reason. furthermore, in the level above we have 'g' for normal graphical, 't' for normal text install, 's' for speech synth, 'd' for graphical dark mode, and 'k' for text dark mode. the text-only sets are identical to the graphical ones except only for dropping the graphical groups, simplifying maintenance, bringing clarity to users of images (who may not have even made the image) that the set is text-only, and keeping consistent hotkeys between graphical and text-only. a 'start installer with speech synthesis' entry shortcut has been placed at the top menu level alongside the 'start installer' shortcut. Gbp-Dch: Short
2020-05-15bootloaders: add accessible dark contrast installer menu optionsLyndon Brown
following official install discs. i've not bothered to update grub-legacy this time. Gbp-Dch: Short
2020-05-15bootloaders: add advanced speech synth install entriesLyndon Brown
following the presence of them in the official install discs. also drops unnecessary word "graphical" from existing speech synth entry, following official Debian install discs. i've not bothered to update grub-legacy this time. Gbp-Dch: Short
2020-05-03bootloaders: add timezone to splash timestampLyndon Brown
2020-05-02bootloaders: tweak default splash text to avoid overlapLyndon Brown
the default grub config has a quirk of using the syslinux splash when present, which as a sidenote i believe is because only the syslinux script has the code for converting an SVG (i've not researched to confirm). the problem is that the default splash is such, with the text listing package versions used, that this overlaps with the menu title in grub. i've tweaked the "built on" and package details text to reduce its size (bumped the line-height up slightly though) to avoid the overlap. this was a pain in the *** to get done. inkscape likes to crash at the slightest little thing like clicking on interface controls; each time it saves it seems to swap a bunch of stuff in the file which can make a hugely messy diff, i had to save, close, open, change, undo, and save again, just to get a sain diff; and numerous times testing different sizes and such in actual builds (rather than separate conversions) some of the package detail lines would for some unknown reason decide to end up on the same line as another, wth... anyway, i've finally managed to get a new revision successfully created and it seems bug free wrt. that same line issue to me, both converting outside of live-build (in my sid host), and within a buster build. the size of the text changed seems closer to the size of the actual menu entries (there's no need for it to be bigger), and now is nicely clear of the menu title. Gbp-Dch: Short
2020-05-02syslinux: updated SVG for splashLyndon Brown
opening the file in inkscape resulted in a dialog explaining that inkscape used to work on a 90 DPI basis but switched to 96 DPI for better compatibility reasons, and wanted to convert the file. this is simply the result of it having done the conversion. it advised that for documents not intended to be printed that there should be no noticeable difference. i checked the output and it seems identical to before. i tried to look at the actual diff, but it's a lot of noise, most of which is just reordering, and i gave up, since the output looks identical i'm not going to worry. Gbp-Dch: Ignore
2020-05-01grub2: fix missed vga= consistency adjustmentLyndon Brown
Gbp-Dch: Ignore
2020-05-01bootloaders: change 'Advanced options' to 'Utilities'Lyndon Brown
more fitting now that we've moved the advanced installer entries out to a different submenu, leaving just memtest (and HDT on syslinux). the advanced.cfg file is also renamed to utilities.cfg in the syslinux case, but in a backwards compatible way of moving the user advanced.cfg file over the new one, if the user provides a file with the old name. alternatively we could just leave the old name in place, but that would be a little odd. Gbp-Dch: Short
2020-05-01grub2: fix vga= consistencyLyndon Brown
- most entries used vga=788 rather than vga=normal (which are equivalent) - the syslinux menu uses 788 exclusively - so do the official install discs Gbp-Dch: Short
2020-05-01grub2: tiny label consistency tweakLyndon Brown
as per style in official Debian install discs Gbp-Dch: Ignore
2020-04-30grub2|loopback: fix theme issues for submenusLyndon Brown
also enables greater flexibility for users to override more aspects of theme separate from menu entries, and similarly the initial config details separate from the menu entries. (with the recent change to merge user files with the defaults rather than replace them, users can pick which of these individual components they wish to customise. identical to change as sent in to Kali and accepted by Raphaël. Gbp-Dch: Short
2020-04-30grub2: fix lost pre-prepared files detailLyndon Brown
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-24syslinux: deduplicate common filesjnqnfe
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-24Synchronize syslinux menu structure with the grub-pc oneRaphaël Hertzog
* 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-24syslinux: fix lack of top level install optionLyndon Brown
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-24syslinux: fix missing hotkeysLyndon Brown
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-23syslinux: use linux/initrd placeholdersLyndon Brown
enabling improved flexibility for any possible future path changes. Gbp-Dch: Ignore
2020-04-23grub2|loopback: avoid empty submenuLyndon Brown
don't include the advanced menu at all if it's only entry - memtest - is not included (you just get a menu entry that does nothing, which may confused users into thinking that something is broken, as opposed to showing an empty submenu as i expected). Gbp-Dch: Short
2020-04-23grub2|loopback: extract memtest menu entry creation to config fileLyndon Brown
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-23grub2|loopback: extract install menu entries to config filesLyndon Brown
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
2020-04-23grub2|loopback: move advanced installer entries under own submenuLyndon Brown
this takes a step forward in moving towards the same updated layout as with syslinux; here we get: - <live entries> - Start installer - Advanced install options... - <full set of install options> - Advanced options... - Memory Diagnostic Tool (memtest86[+]) note that this only affects the default menu. custom configs are not affected by this change. further steps to complete the move to the updated layout will follow later. "Advanced options..." should perhaps be renamed later. Gbp-Dch: Short
2020-04-23grub2|loopback: add hotkey for advanced options submenu (a)Lyndon Brown
2020-04-23grub2|loopback: use '@' bookended placeholdersLyndon Brown
...for consistency with syslinux config placeholders and improved clarity of what text is a placeholder. the old placeholders without the bookends are still replaced for user configs for backwards compatibility. the new ones are little used just at the moment but are expected to become used much more in later commits. Gbp-Dch: Short
2020-03-25syslinux: properly fix shortcut caret appearing in menu entriesLyndon Brown
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-22bootloaders: remove old "video=vesa:ywrap,mtrr" kernel param, as done in d-ijnqnfe
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-16syslinux: use more dynamic memtest menu config filejnqnfe
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-16syslinux: add memtest menu entry only if including memtestjnqnfe
2020-03-16syslinux: add install menu entries only if including installerjnqnfe
2020-03-16syslinux: expand list of install optionsjnqnfe
2020-03-16bootloaders: add install with speech synthesis menu entriesjnqnfe
Following the official Debian install disks Gbp-Dch: Short
2020-03-16syslinux: fix duplicate shortcut useLyndon Brown
2020-03-16syslinux: changed 'build' to 'built' in splashjnqnfe
Appears before a timestamp which reflects when the image was built, so 'built' is more correct than 'build' here. Gbp-Dch: Short
2020-03-16syslinux: fix shortcut caret appearing in menu entriesjnqnfe
also fixes the mistaken assignment of the same shortcut for both entries in live.cfg.in Gbp-Dch: Short
2020-03-16grub2/loopback: fix highlight readabilityjnqnfe
Current splash makes it very difficult to read menu entries. Black as a background color is actually interpreted as transparent, so switching to something else so the highlighted menu entry can be read more easily. Gbp-Dch: Short
2020-03-05bootloaders: fix ignoring LB_DEBIAN_INSTALLER_GUI in menu creationLyndon Brown
LB_DEBIAN_INSTALLER_GUI defines whether or not to provide the graphical installer. the installer_debian-installer script pays attention to it and does not download it if not wanted. the actual bootloaders however (both grub2/loopback and syslinux) ignore it, which leaves broken and unwanted menu entries. this fixes that. Gbp-Dch: Short Closes: #952890
2020-01-23Standardize on having the GUI installation first in boot menusRaphaël Hertzog
debian-cd changed it that way, we already have it that way in EFI boot, let's be consistent.
2019-05-30Remove ldlinux.c32 for extlinux and syslinuxMatthijs Kooijman
Since syslinux 5.00, this file is installed into the disk root by the extlinux and syslinux installer commands. For pxelinux and isolinux, these files still need to be added manually. This is documented at: https://wiki.syslinux.org/wiki/index.php?title=Library_modules#All_Syslinux_variants_need_an_additional_ldlinux_module Keeping these unused files around is probably only confusing, so better to remove them.
2017-06-09Add keyboard shortcut on the "Advanced options" syslinux menu entryRaphaël Hertzog
Thanks to Daniel Reichelt <debian@nachtgeist.net> for the patch. Closes: #864386
2016-12-14Cleanup binary_loopback_cfg and offer more freedom in overriding the default ↵Raphaël Hertzog
grub-pc configuration.
2016-12-02Clean up grub configuration codeRaphaël Hertzog
* Use only long kernel names. * Put advanced options in a submenu. * Use distro-agnostic labels. * Don't generate entries with kernel version when we have a single version.
2016-12-02Use a grub theme that integrates reasonably well with the current background ↵Raphaël Hertzog
picture.
2016-11-28Try to reuse /isolinux/splash.png in default grub configuration.Raphaël Hertzog
2016-01-08Add symlinks for libgpl.c32 and libmenu.c32Raphaël Hertzog
They are required for the "Hardware Detection Tool (HDT)" menu entry that live-build adds in the advanced menu. Sponsored-by: Offensive Security
2015-05-04Renaming grub helper to grub-legacy for consistency.Daniel Baumann
2015-05-04Renaming grub2 helper to grub-pc for later grub-efi addition.Daniel Baumann
2015-04-29Moving grub and grub2 templates into shared bootloader config directory.Daniel Baumann
2015-01-25Updating d-i bootparameter separator for jessie.Daniel Baumann
2014-12-10Dropping support for wheezy.Daniel Baumann