summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-29manpages: tiny clarifications and tweaksLyndon Brown
not worth listing the specifics mostly the following though: - "(comma or space separated)" -> "(a comma or space separated list)" - quoting values Gbp-Dch: Ignore
2020-04-29manpages: fix formatting mistakesLyndon Brown
shortoptions also emboldened Gbp-Dch: Ignore
2020-04-29manpages: tiny correctionLyndon Brown
"all (applicable)" -> "all" this needed adjusting after 38a5aed0dcdf71f43cecfadc6e34c659408b6a00 don't want to confuse users Gbp-Dch: Ignore
2020-04-29manpages: fix typosLyndon Brown
"whould" -> "would" "build" -> "built" Gbp-Dch: Ignore
2020-04-29manpages: fix typoLyndon Brown
"bugreport" -> "bug report" i won't bother changing the dates just for this one. Gbp-Dch: Ignore
2020-04-29a couple tiny doc fixesLyndon Brown
Gbp-Dch: Ignore
2020-04-28fix auto file handling regressionLyndon Brown
b4598b234c90b6d1c93bd64166d4aa46ce9388bb mistakenly stopped passing along options to auto files. Gbp-Dch: Ignore
2020-04-26config: remove redundant validation checkLyndon Brown
this is already covered by the check above it Gbp-Dch: Ignore
2020-04-25manpages: fix typoLyndon Brown
"Sor" -> "So" Gbp-Dch: Ignore
2020-04-25Do not overwrite splash.png if the user has provided itRaphaël Hertzog
The unconditional SVG to PNG conversion could overwrite a splash.png provided by the user. Ensure we don't overwrite such a file. But we still remove the SVG file as syslinux is not able to make use of it.
2020-04-25Make librsvg2-bin dependency unconditional for syslinuxRaphaël Hertzog
We do provide a splash.svg by default so the check will always return true unless the user has forked live-build... thus the check is pointless.
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-24Use correct variable name to detect removal stepRaphaël Hertzog
Due to this mistake, the helpers were not called in reverse order during the removal step. This lead to things like "apt update" failing because a broken /etc/resolv.conf has been restored before the call to "chroot_archives remove". Gbp-Dch: Ignore
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-24Replace "Help" calls with "Man" and get rid of HelpRaphaël Hertzog
2020-04-24Make "Man" function smarter to also work for "lb --help"Raphaël Hertzog
2020-04-24Improve handling of options allowed for "lb" before the sub-commandRaphaël Hertzog
2020-04-24Revert "frontend: properly handle option processing"Raphaël Hertzog
This reverts commit 6b7c8ed4bf15175299729355f04d60dcbac1aded as it's breaking multi-value space-separated parameters.
2020-04-24config: tidy directory construction and empty directory cleaningLyndon Brown
2020-04-24config: tidy config filesLyndon Brown
2020-04-23frontend: do no try to look for sub-commands in the PATHRaphaël Hertzog
This is a recipe for disaster and it actually already fails when you pass something that looks like a long option as first argument because $(which --long-option) will produce an "Illegal option" string on its standard output. $ lb --debug config --archive-areas "main contrib non-free" Illegal option -- /usr/bin/lb: 54: [: Usage:: unexpected operator E: Unknown command: --debug
2020-04-23chroot_resolve: fix broken network connectivityLyndon Brown
introduced by an issue with the implementation of 91d446d93ed717b1082bb646fbef65cd1cbc25f5 the introduced of that commit caused builds to fail doing `apt-get update` or downloading packages and such. this tweak fixes the problem. Gbp-Dch: Ignore
2020-04-23stagefiles: guard unnecessary chroot removalLyndon Brown
just as most scripts are skipped if their stagefile exists (indicating that they have already been run to completion), including chroot preparation scripts in install mode, this implements the same guard for chroot prep remove mode, such that they exit early if their stagefile does not exist, indicating that the modification has already been removed. (also override-able by --force in the same way). this basically just uses a tweaked copy of Check_stagefile(). Gbp-Dch: Short
2020-04-23config: s/LIVE_IMAGE_TYPE/LB_IMAGE_TYPE/Lyndon Brown
no backwards compatibility hack for reading the old var from existing saved config used because this was previously stored in the alternate format config/build file. Gbp-Dch: Short
2020-04-23config: s/LIVE_IMAGE_NAME/LB_IMAGE_NAME/Lyndon Brown
no backwards compatibility hack for reading the old var from existing saved config used because this was previously stored in the alternate format config/build file. Gbp-Dch: Short
2020-04-23config: s/LIVE_CONFIGURATION_VERSION/LB_CONFIGURATION_VERSION/Lyndon Brown
2020-04-23config: address fixmeLyndon Brown
these options are not internal, they are user controllable Gbp-Dch: Short
2020-04-23config: remove obsolete variableLyndon Brown
2020-04-23config: revert partial format conversionLyndon Brown
back in v4.0~a6-1 a transition process was started to move the live-build config to a new format. the new format was INI style, and required parsing functions to read/write values, compared to the existing format which was just shell script code setting variables. this partial transition is the explanation for the existence of the `New_configuration()` function, and understanding this is important to understanding the purpose of it - it is not in fact intended for creating a new configuration, it is just related to the new config format transition. the positives of the new format were that it was somewhat cleaner looking, while the negative was the terrible relative efficiency. the file `config/build` was created to hold options in this new format. the transition was only ever completed for a handful of config options: - architecture - archive areas and parent archive areas - live image name - live image type a 'configuration version' attribute was also saved, which is not used by anything. the bootstrap-mirror and parent-bootstrap-mirror attributes are pointlessly stored in it seemingly resulting from work done in v4.0~a17-1. (they are also stored in another config file from which the value is actually used). it in fact seems to have been a source of confusion for Raphaël in authoring 44b9b0a6501476de594ce3783cea5df0c141478c, since the new `[parent]-distribution-{chroot|binary}` options it introduced were stored both in `config/bootstrap` and in `config/build`, while only used from the former. i expect, understandably, that he thought that `config/build` was just an information file. Gbp-Dch: Short
2020-04-23move grub-pc specific code to actual grub-pc scriptLyndon Brown
the grub-pc image creation code has no business being in binary_iso, it should be in binary_grub-pc. it should be noted that the binary_iso script did not even have the necessary package check for grub-mkimage, while binary_grub-pc did have it, pointlessly. 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-23Add updated directives to enable cryptsetup support in initrdRaphaël Hertzog
This fixes cryptsetup modules not being installed into initrd with warning: > cryptsetup: WARNING: The initramfs image may not contain cryptsetup binaries > nor crypto modules. If that's on purpose, you may want to uninstall the > 'cryptsetup-initramfs' package in order to disable the cryptsetup initramfs > integration and avoid this warning. Thanks-to: Marcel Partap
2020-04-23Fix indentationRaphaël Hertzog
2020-04-23config: create config/bootloaders directoryLyndon Brown
to help users know that this is where they can put custom bootloader configs, just as other directories are created for them. Gbp-Dch: Short
2020-04-23binary_syslinux: rely on $LIVE_BUILD_VERSION instead of lb --versionRaphaël Hertzog
2020-04-23tidy version reported in `lb config --dump`Lyndon Brown
live-build might be run from a local folder rather than the system installation, so the dpkg version number should not override the version picked up from VERSION if we care about the possibility of the installed package version potentially differing from the version of the git checkout, or whatever, then this should be printed alongside it, as now done. Gbp-Dch: Ignore [Raphaël Hertzog: tweak to apply on top of my changes]
2020-04-23Fix version computing when LIVE_BUILD is setRaphaël Hertzog
It used to rely on the $LIVE_BUILD/VERSION file which is now gone. Instead we now rely on the debian/changelog file just like we do in the Makefile.
2020-04-23Drop the epoch in /usr/share/live/build/VERSIONRaphaël Hertzog
2020-04-23Use descriptive parameter names for Usage()Raphaël Hertzog
2020-04-23usage: take exit code as paramLyndon Brown
thus it can correctly indicate success/fail status instead of always indicating failure. when a user asks for usage with -u|--usage then we should exit in success mode rather than failure as when usage in printed in response to incorrect usage. Gbp-Dch: Short
2020-04-23frontend: properly handle option processingLyndon Brown
this means that the usage goes from: lb {-h|--help|-u|--usage|-v|--version} lb COMMAND [OPTIONS] to: lb {-h|--help|-u|--usage|-v|--version} lb [FRONTEND_OPTIONS] COMMAND [COMMAND_OPTIONS] though it is probably not worth is to update the description in the manpages...? hmm... so for instance this matters for color control with --color|--no-color (you already had full control via environment vars). previously you could do `lb COMMAND --no-color` to turn off colour, only to find that output at the frontend level was still coloured (the option is processed at the command context level, not the frontend), so you might try to instead use `lb --no-color COMMAND`, only to find that this was not supported. Well now it is, and used at the frontend level will fully control colour output (after the command is processed anyway). the full set of common options are thus available (except --force) at the frontend level, and thus for instance all Echo_*() helpers used in the frontend will work correctly after args are processed. furthermore usage like `lb --color --help` will actually work. (not that color is used there, but this previously would have failed with the frontend treating the `--color` argument as the command; that's the point!) Gbp-Dch: Short
2020-04-23frontend: change "no such script" to "unknown command"Lyndon Brown
as far as the user is concerned, 'foo' in `lb foo` is a command; they do not know or need to know that the commands also correspond to actual scripts. Gbp-Dch: Short
2020-04-23frontend: reorder checksLyndon Brown
perform the check that the script exists before sorting out the environment to give it, or checking root privileges. Gbp-Dch: Short
2020-04-23rename LB_BOOTSTRAP_QEMU_ARCHITECTURES to LB_BOOTSTRAP_QEMU_ARCHITECTURELyndon Brown
2020-04-23Keep LB_ARCHITECTURES environment variable for backwards compatibilityRaphaël Hertzog
Custom hook scripts may use the variable. And conditional package lists can also rely on this variable.
2020-04-23rename LB_ARCHITECTURES to LB_ARCHITECTURELyndon Brown
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1 to keep the renaming simple, but leaving the variable plural is a cause for confusion. since this property is stored in the INI style config/build config file rather than a shell script based one, at the property there is already singular, there was no need for a backwards compatibility hack. Gbp-Dch: Short
2020-04-23fix usageLyndon Brown
Gbp-Dch: Ignore
2020-04-23move script param capture to before arg processingLyndon Brown
makes them consistent with other similar script-specific param handling; saves the arg processing from dealing with it. Gbp-Dch: Short