Commit Graph

46 Commits

Author SHA1 Message Date
jnqnfe 24c2b3e119 syslinux: deduplicate common files
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-24 18:50:37 +01:00
Raphaël Hertzog 34a72caf49 Synchronize syslinux menu structure with the grub-pc one
* 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-24 18:57:03 +02:00
Lyndon Brown 47b0a623dd syslinux: fix lack of top level install option
0bf9d2d390 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-24 15:38:55 +00:00
Lyndon Brown 41ca745b6c syslinux: fix missing hotkeys
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-24 14:43:20 +00:00
Lyndon Brown 49794f118f syslinux: use linux/initrd placeholders
enabling improved flexibility for any possible future
path changes.

Gbp-Dch: Ignore
2020-04-23 15:51:57 +00:00
Lyndon Brown 8775c8075c syslinux: properly fix shortcut caret appearing in menu entries
this reverts commit 0cef87ffca 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-25 01:25:50 +00:00
jnqnfe a25b77e099 bootloaders: remove old "video=vesa:ywrap,mtrr" kernel param, as done in d-i
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-22 19:43:56 +00:00
jnqnfe 38af959aa5 syslinux: use more dynamic memtest menu config file
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-16 23:08:26 +00:00
jnqnfe 31fa6abd36 syslinux: add memtest menu entry only if including memtest 2020-03-16 23:08:26 +00:00
jnqnfe 7ffd2288d9 syslinux: add install menu entries only if including installer 2020-03-16 23:08:26 +00:00
jnqnfe 0bf9d2d390 syslinux: expand list of install options 2020-03-16 23:08:26 +00:00
jnqnfe 24aab15d2a bootloaders: add install with speech synthesis menu entries
Following the official Debian install disks

Gbp-Dch: Short
2020-03-16 20:33:18 +00:00
Lyndon Brown eeedf10de5 syslinux: fix duplicate shortcut use 2020-03-16 17:49:43 +00:00
jnqnfe 396b1727ad syslinux: changed 'build' to 'built' in splash
Appears before a timestamp which reflects when the image was built, so 'built' is more correct than 'build' here.

Gbp-Dch: Short
2020-03-16 17:48:59 +00:00
jnqnfe 0cef87ffca syslinux: fix shortcut caret appearing in menu entries
also fixes the mistaken assignment of the same shortcut for both
entries in live.cfg.in

Gbp-Dch: Short
2020-03-16 17:48:51 +00:00
Lyndon Brown 2f5ae873b0 bootloaders: fix ignoring LB_DEBIAN_INSTALLER_GUI in menu creation
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-03-05 11:48:04 +00:00
Raphaël Hertzog 2127283494 Standardize on having the GUI installation first in boot menus
debian-cd changed it that way, we already have it that way in EFI
boot, let's be consistent.
2020-01-23 16:47:04 +01:00
Matthijs Kooijman f62a6f9dea Remove ldlinux.c32 for extlinux and syslinux
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.
2019-05-30 16:14:51 +02:00
Raphaël Hertzog d18d0dfe2a Add keyboard shortcut on the "Advanced options" syslinux menu entry
Thanks to Daniel Reichelt <debian@nachtgeist.net> for the patch.

Closes: #864386
2017-06-09 13:41:13 +02:00
Raphaël Hertzog 1ccb416230 Add symlinks for libgpl.c32 and libmenu.c32
They are required for the "Hardware Detection Tool (HDT)" menu entry that
live-build adds in the advanced menu.

Sponsored-by: Offensive Security
2016-01-08 09:18:35 +01:00
Daniel Baumann ba6b9adeff Updating d-i bootparameter separator for jessie. 2015-01-25 10:02:34 +01:00
Daniel Baumann dd47358700 Unconditionally replacing bootloader symlinks with syslinux 6 from jessie, this will break building wheezy images (so we have to come up with something better than that prior upload). 2014-07-22 20:26:06 +02:00
Daniel Baumann f78b2a7d25 Adjusting splash.svg filename in embedded syslinux configurations to match code (Closes: #745020). 2014-04-26 08:05:32 +02:00
Daniel Baumann aa7939e085 Removing unused description variable in syslinux configs. 2013-09-18 11:43:49 +02:00
Daniel Baumann f35f4c6b1d Including memtest86+ in syslinux menu. 2013-05-27 17:07:05 +02:00
Daniel Baumann ba7535c73e Removing superfluous menu default directive in installer syslinux menues. 2013-05-06 14:50:05 +02:00
Daniel Baumann fdcebc3365 Including HDT in advanced options menu within syslinux menu. 2013-05-06 14:50:05 +02:00
Daniel Baumann 51e6e3b324 Correcting wrong debian-installer syslinux menu files. 2013-05-06 14:50:05 +02:00
Daniel Baumann 2fb4009a8c Updating syslinux configurations and handling for syslinux 5. 2013-05-06 14:50:05 +02:00
Daniel Baumann 3b7335e86b Correcting vshift in syslinux themes to correct display bug with overlong lines, thanks to Thanatermesis <thanatermesis@gmail.com>. 2013-05-06 14:50:05 +02:00
Raphaël Hertzog ea3c9ae385 Adding initial menu entries for debian-installer. 2013-05-06 14:50:02 +02:00
Daniel Baumann d1047e809a Adding debian version 4.0~a1-1. 2013-05-06 14:48:46 +02:00
Daniel Baumann 052b308147 Removing superfluous menu default directive in installer syslinux menues. 2013-02-12 05:23:51 +01:00
Daniel Baumann fb4d939559 Including HDT in advanced options menu within syslinux menu. 2013-02-08 22:44:00 +01:00
Daniel Baumann 574c96a037 Correcting wrong debian-installer syslinux menu files. 2013-02-08 22:43:58 +01:00
Daniel Baumann bc08ea0115 Updating syslinux configurations and handling for syslinux 5. 2013-02-08 21:40:28 +01:00
Daniel Baumann 74dbadf2ff Correcting vshift in syslinux themes to correct display bug with overlong lines, thanks to Thanatermesis <thanatermesis@gmail.com>. 2013-01-25 13:00:02 +01:00
Raphaël Hertzog 5830520ecb Adding initial menu entries for debian-installer. 2012-12-10 20:23:10 +01:00
Daniel Baumann 56e4085c60 Making failsafe boot parameters fully customizable like the normal ones. 2012-10-04 14:25:01 +02:00
Daniel Baumann 5b8cfdc193 Clearing the screen when exiting syslinux menu. 2012-10-01 04:46:41 +02:00
Daniel Baumann 69df65a5db Removing superfluous menu default directive in syslinux configuration files. 2012-10-01 04:44:23 +02:00
Daniel Baumann fd73a68615 Simplify internal replacement strings when processing syslinux configuration files. 2012-10-01 04:43:14 +02:00
Daniel Baumann c9def02d74 Using linux rather than kernel directive in syslinux configuration files. 2012-10-01 04:39:27 +02:00
Daniel Baumann a9bb5418c9 Using initramfs generator specific boot parameters in syslinux configuration files. 2012-09-30 09:20:15 +02:00
Daniel Baumann b693418459 Using dedicated initrd line in syslinux configurations rather than stuffing everything in one line. 2012-09-30 08:30:06 +02:00
Daniel Baumann daf7a8909d Adding extlinux bootloader configuration files. 2012-07-18 22:30:13 +02:00