Git log: commit 263f84fe801f1664150673158495f26c9ce5ab32
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 19:10:47 2020 +0100
clean: handle all common options
support for options like `--debug` was missing.
Gbp-Dch: Short
commit fca128314754d937510312ce41ac39ae5d4d8125
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 19:41:45 2020 +0100
clean: refactor
this simplifies things to avoid the messy recursion.
it is also a necessary step to implementing handling of common options
like --debug. we need to process all options to decide how to approach
doing things (e.g. with debug messages to be output or not) before actually
performing any work, in order for options like --debug to be reacted to
properly.
also, as things were, options like `--debug` were not being passed along
in the recursive executions, while now that is no longer an issue.
the order of file/folder deletions for `--all`|`--purge`|`--remove`
actions is slightly changed here, but i don't see any issue with that and
it's cleaner to not preserve that.
Gbp-Dch: Short
commit 0afd3625ed3c2039e347830464eda8a378b2eb53
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri May 1 19:25:40 2020 +0100
bootloaders: reorganise installer menu entries
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
commit ab2e8a91f5247075c173930f340ebccb92914a0b
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat Apr 4 05:27:31 2020 +0100
bootloaders: add accessible dark contrast installer menu options
following official install discs.
i've not bothered to update grub-legacy this time.
Gbp-Dch: Short
commit 9b2564a3ff2264ce3fabd02165f6e86b3a4f2621
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat Apr 4 05:10:13 2020 +0100
bootloaders: add advanced speech synth install entries
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
commit 180207d711e7b882f110643178393fff611e46b5
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 21:49:57 2020 +0100
Revert "config: catch and report unexpected arguments"
This reverts commit 665372c19d7f54b5cfb92aaf313b7df9570f6191.
the kali test failed due to their script using a hack of passing along a
custom option after an early terminator through to their auto/config file.
the change implemented here was valuable, but i'll have to look into
revising things to work with what Kali is doing.
Gbp-Dch: Ignore
commit 18eefdd6f38631e15e56a2bd7a25bba50b05acfa
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 16:45:57 2020 +0100
s/Remove_package/Remove_packages/
it removes one or more, so should be plural for clarity
Gbp-Dch: Short
commit 919a464b64b4bda52a56b8732ea5ef7727649cf0
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 16:42:44 2020 +0100
s/Install_package/Install_packages/
it installs one or more, so should be plural for clarity
Gbp-Dch: Short
commit 9c8d26c97ff51ebc105e2bcf815c29ff79eea2a6
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 19:29:36 2020 +0100
packages: avoid unnecessary nesting
Gbp-Dch: Ignore
commit f27d13de08af9ae788b0d2f848e2202a399e4f43
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 01:56:36 2020 +0100
make temporary state of installed tools recoverable
some scripts temporarily install packages to accomplish some work before
then removing them. the list of packages installed is kept in memory in a
variable.
a weakness of this design is that if a failure occurs or the user cancels,
and then following this the user re-runs `lb build`, letting it try to
pick up and recover from where it left off, that list of packages that had
been installed is lost, resulting in those packages that were installed
then being a permanent part of the chroot.
here we fix this weakness by backing up the list to a file, which is always
read from on removal. thus in a recovery situation, any packages still
installed from a situation like that just described, will be removed upon
the next use of `Remove_package()`.
this is not perfect, since we are having to wait for opportunistic
execution of the remove function. we need to find a suitable place for the
`Cleanup_temp_packages()` function to be used.
- doing so in `Init_config_data()` would not be suitable because we don't
hold the lock when that's run, even if we ignored the hijacking of that
function for taking such action...
- doing it in `Exit()` doesn't seem a good fit either.
- putting it explicitly in every build script just seems a little messy...
perhaps a local exit trap like for removing the lock...?
note that `binary_rootfs` skips running the remove function after installing
tooling, since it just throws the wrapper chroot away, which then leaves the
file around with stale data for the next remove instance to pick up, which
then does not actually remove it because it's not installed. this is not
ideal either... perhaps the optimisation should be removed from that script?
Gbp-Dch: Short
commit a065e60043fc5ff217be0be90191305d8ade2518
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 19:04:35 2020 +0100
manpages: clarify UTC timestamps wrt. build log
Gbp-Dch: Ignore
commit 665372c19d7f54b5cfb92aaf313b7df9570f6191
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 18:58:39 2020 +0100
config: catch and report unexpected arguments
after handling arguments, catch and report any remaining "non-option"
arguments.
for instance users could make the basic mistake of using
`lb config --bootloaders syslinux grub-efi`, i.e. failing to quote the
multiple bootloaders (i actually encountered a user doing this who swore
that "it just worked"). catching and reporting such mistakes could be
valuable to users.
previous behaviour:
```
$ lb config --bootloaders syslinux grub-efi
P: Updating config tree for a debian/buster/amd64 system
P: Symlinking hooks...
```
new behaviour:
```
$ lb config --bootloaders syslinux grub-efi
[2020-05-05 18:56:07] lb config --bootloaders syslinux grub-efi
E: Unexpected argument found: grub-efi
```
Gbp-Dch: Short
commit d68290058e523bed56a8235e6408816ae3c8607e
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue May 5 00:52:13 2020 +0100
debootstrap: fix wrong param for Check_package call
debootstrap must obviously exist in the host. we thus must pass 'host'
not 'chroot' such that a warning about needing to install it on your host
system is output, rather than it being added to a list of packages to be
installed, which never occurs in this script.
Gbp-Dch: Ignore
commit 7cf7f74bc0570beedbea4b085fc799653a87c86e
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 23:19:58 2020 +0100
arches: fix Check_crossarchitectures param passing
Gbp-Dch: Ignore
commit 8a1bbe0841ced044444ebf4d7f2b44a689b9c26b
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 23:15:52 2020 +0100
arches: tidy
Gbp-Dch: Ignore
commit 08c86dc8ace433bd1efacc807357dc92661510ab
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 23:11:27 2020 +0100
arches: fix some Check_architectures() mess
- the comparison with LB_ARCHITECTURE seems to be based upon an old idea
of it potentially being intended in the past to hold more than one
arch (when it's name as also plural), but it in fact only holds one.
- similarly LB_BOOTSTRAP_QEMU_ARCHITECTURE is singular, so the comparison
with the set of params is bad.
- storing $@ in a variable before then looping is not a good idea
- script name was not being passed to the warnings
- can simplify by just returning in the valid case
i'm very suspicious about the correctness of the qemu bits, but that
can wait for now.
Gbp-Dch: Short
commit a542d52141acef0e2d2bb78253d6b5df4305dcd1
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 18:20:02 2020 +0100
rename binary_loopback_cfg to binary_grub_cfg
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
commit 3a523c3fc12ef23e720020e2bad151fc91b8b35d
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 17:28:48 2020 +0100
binary_iso: properly handle multiple bootloaders
with LB_BOOTLOADER_BIOS and LB_BOOTLOADER_EFI introduced, we can simplify
and correct things here.
previously it was possible for more than one of each type to be added.
Gbp-Dch: Short
commit d7883ec32b2bb907fce17fb759c08c5cd9851fc3
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 16:12:45 2020 +0100
config: improve BIOS/EFI bootloader selection handling
the design choice from when EFI support was introduced was to change
`--bootloader` to `--bootloaders`, with users specifying their selection
of BIOS and EFI bootloaders together. at this time there were not even any
decent validation checks being performed, and invalid combinations could
cause some chaos.
since then proper validation was put in place, including checking that
only a single instance of each of BIOS and EFI bootloaders exists in the
selection.
here we tweak things such that we stick with the same option, but we split
the selection up such that we store the BIOS and EFI selections separately
within the saved config file, and offer it up to scripts to help simplify
those scripts.
we must however retain support for splitting from the combined option,
both because we still use it in the combined option, and for backwards
compatibility with older saved configs.
Gbp-Dch: Short
commit 3f840aeeba982a858a881271a3bb48bca5b50dd8
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 14:28:37 2020 +0100
fully validate BIOS/EFI bootloader combinations
thus far, config bootloader validation only did the basic check that each
bootloader specified was a known and supported bootloader, it did not check
combinations.
it now checks combinations, and strips out the previous "bootloader role"
stuff.
the no-bootloaders warning is duplicated, covering two slightly different
situations (empty string, and whitespace string). this is anticipated to
be just temporary, with this just being the first step in better handling
bootloader selections.
Gbp-Dch: Short
commit f3a818da9ab1998944c20b0847a733bbdacb61d8
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 21:37:03 2020 +0100
binary_hdd: remove incorrect local scope
the "FIXME" function wrapper is just to temporarily disable the code.
Gbp-Dch: Ignore
commit 976be9f44bca9ee8be7e438348c1068faf50d9c6
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 17:40:23 2020 +0100
indentation fix
Gbp-Dch: Ignore
commit 7ad96bd64418951ab48e6e1c522c501e57b6b9d9
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 17:38:53 2020 +0100
fix redundant and incorrect source selections
"grub" presumably was what is now called "grub-legacy"
removed both because there is already a proper piece of code adding
bootloader packages.
Gbp-Dch: Ignore
commit cb2d9a0fe467dbf7a4de691e52c1f412007c098c
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 17:37:14 2020 +0100
fix another overlooked "grub" -> "grub-legacy" instance
Gbp-Dch: Ignore
commit 9d7393bbdbec133dedbc5c084a2596de227e04cf
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 16:16:00 2020 +0100
config: add note
The core purpose of `Prepare_config()` is to prepare the config by setting
defaults where not specified. It should not be involved itself in
validation of user options.
This can be an important distinction, for instance in `clean` where we
use this function, but avoid validation to potentially allow for an option
that deletes the config, that should work even in the face of an invalid
config.
Gbp-Dch: Ignore
commit 89ed6a54a10ba3b4ce781d8e1805f099b77cb7be
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 14:39:55 2020 +0100
config: fix inadequate validation check
Gbp-Dch: Ignore
commit 943c8fb5feb27cd60fd335f6e9e77524127f0f17
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 01:34:05 2020 +0100
extend config validation to all build components
while `lb build` ran the config validation check, spotting invalid configs
and stopping with an error, the major build stages if executed directly did
not, nor did the component stages.
here we move execution of the validation function into the common init
function, with an exported variable used to indicate that validation has
been performed. thus validation is performed no matter what part of the
build system you execute, but only once.
Gbp-Dch: Short
commit 7acd1f488f3b9d4348449a27d9412488dc8e1657
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 13:21:12 2020 +0100
get rid of a couple of useless variables
Gbp-Dch: Ignore
commit 76459a39cdc6f35485a867fd96c7cce29a2cc6b9
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon May 4 13:10:42 2020 +0100
clean: tweak init
`Init_config_data` is more suited to build scripts than here. note that
it's not used in `config` either. this deliberately does not pass along
arguments to it because `Arguments()` can only handle the basic common
options, not the `clean` set. this is somewhat confusing and causes a
pointless execution of `getopt`. furthermore the function is expanding
slightly further beyond it's original scope, with yet more change coming
that's unsuitable for `clean`, so it makes sense to avoid using the
function here just for the couple of function calls needed.
validation of the config is disabled, as it is not performed currently.
it is not clear if it should be enabled or not for `clean`. it may be
useful to not validate, if we wish to be able to provide users with an
option to be able to delete the config.
Gbp-Dch: Ignore
commit 21c697617d8299e19a99df12c70e36b379c91fce
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 21:02:32 2020 +0100
bootloaders: add timezone to splash timestamp
commit 9bc35759aab95d849cba38bcb6fd1bb072df9907
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 18:02:04 2020 +0100
config: fix stale live-build version in iso-preparer
using `$VERSION` as part of the default `$LB_ISO_PREPARER` means that when
you simply run `lb config` once, this variable is stored as a part of the
string, and replaced on use, but if you run `lb config` twice, it gets
replaced with a fixed version, that is then used in all subsequent builds.
let's replace with a placeholder (`@LB_VERSION@`) that can be used both in
the default, or in user strings, and will be replaced on use only.
this means that subsequent builds will always reflect the actual version
of live-build used.
Gbp-Dch: Ignore
commit 26a89a45e5c5311cfd43c3a3e37e18686462e402
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 19:28:58 2020 +0100
disk_info: obey new UTC timestamp control
commit ebf4b04b7f0bab4745ca9345c26a83d937a72578
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 20:24:33 2020 +0100
source_disk: de-duplicate date construction
Gbp-Dch: Ignore
commit 558942eccb9d90aa5ba0b9e0158504669efe907c
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 19:27:09 2020 +0100
syslinux: obey new UTC timestamp control
commit 31cc121c3dbce47438d51928e4b1e7229f514cb4
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 19:22:40 2020 +0100
config: obey new UTC timestamp control for default ISO volume label
commit 6cf3321d8471046bbbe203fb3f18d6507c402024
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 19:19:22 2020 +0100
config: provide UTC timestamp control
`DATE_UTC_OPTION` is set in `Prepare_config()` for use by scripts, even
though only a few scripts will actually use it, since it allows those
scripts to be cleaner. we may want to possibly extend this as a
`DATE_OPTIONS` variable perhaps as part of enabling proper reproduciblity.
Gbp-Dch: Short
commit 23f02ec7eeeac790c247ba084b8755c3b718ff01
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 18:50:41 2020 +0100
syslinux: support timezone date component
since date is not obtained as UTC, timezone is an important detail of
understanding the given time, which users may want to make use of.
Gbp-Dch: Short
commit dc64d8235d4b2706fa2bce6a6bd59d62e2fa9d88
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 18:35:02 2020 +0100
syslinux: fix date construction accuracy issue
don't construct each part from a fresh "now", which can result in
inaccuracies in the overall date due to "now" drifting over the individual
date calls. instead feed the full date that was obtained back into it when
extracting the component parts.
Gbp-Dch: Ignore
commit 7ad69658b249bd268497754b4933a65773c38593
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 15:08:28 2020 +0100
config: fix storage of --jffs2-eraseblock value
broken since it's introduction in 9ffb223d703a4bbb76e5278e59b3cc183f2f1aca
Gbp-Dch: Short
commit 918fe8ce2523ed8e89306b19bcc60fe43041052e
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 12:39:42 2020 +0100
config: small output alignment fix
Gbp-Dch: Ignore
commit 7276d0213fd26ee68b62b84080261e29512871e9
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 01:25:55 2020 +0100
fix usage/help/man bugs
- the definition of $PROGRAM as used in $USAGE strings defined in each
script has been broken for a long time, being simply "lb" when it needs
to be "lb COMMAND".
- `config` changed $PROGRAM to "lb config" thus its output was correct in
this regard unlike everything else, but with the switch to a more
"intelligent" `Man()` function recently, it means that instead of
`man lb config`, what was actually run was `man lb config config`,
which displayed the manpage, then on exiting with `q`, it showed some
sort of index line todo with a "config" search (no exact manpage
match?), for which you had to enter `ctrl+c` to get rid of.
this revises things to fix the issues, minimising change by changing
$PROGRAM to "lb COMMAND", with the frontend overriding this.
Gbp-Dch: Ignore
commit 96c797773201f60badcc7dac8b563f1dcf7ef349
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 00:59:37 2020 +0100
archives: output actual error for bad pass param
Gbp-Dch: Ignore
commit 43b4f9cdf62972bff5cff45f895305c391a895f2
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 00:58:18 2020 +0100
adjust action arg consumption order
did not properly consider all usage cases properly in deciding placement.
this captured `--usage` in `$PROGRAM --usage` as the action for instance.
Gbp-Dch: Ignore
commit 372a8fd91a9ec22c22250e4a0322432305b69a9f
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun May 3 00:38:08 2020 +0100
args: restore a little tidying
lost in a reversion
Gbp-Dch: Ignore
commit 82700d010b2b86e520cc3e71d2fd9ed11813f7d0
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 23:32:04 2020 +0100
manpages: formatting fix
Gbp-Dch: Ignore
commit 23ed83e730396d9af72343e126978418597c7deb
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 20:44:02 2020 +0100
config: tweak config file loading order
load the base set of files first, then any user arch/dist specific override
files second.
this is important since whenever config items get moved in the base files,
this can break the override files, if an option specified in one was moved
to a different common file that it loaded after.
Gbp-Dch: Ignore
commit 640a25f78d312dbd2553ab11131de02a9de3b2f0
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 18:44:03 2020 +0100
clean: output error on invalid argument
commit 22d8ac15dbc75af2acf02447cf045791b137d7d4
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 18:18:49 2020 +0100
options: de-duplicate common option handling
commit 55e17b1e256a4295c67f44e633adaa07f850d4fb
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 15:15:38 2020 +0100
config: refactor basic package list construction
Gbp-Dch: Ignore
commit b2b260242974a3a9ff479f7b597af96b8ea13d0d
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 16:53:38 2020 +0100
clean: expand debugging
Gbp-Dch: Ignore
commit f20b5b4d0ded4a870e5795d4fe277af61f20c0e3
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 16:42:29 2020 +0100
clean: fix missing 'noauto' param for substage execution
these should be bypassing the possibility of running the auto script
surely, just like how this is done for `--all`, otherwise you pass through
the auto file twice.
Gbp-Dch: Ignore
commit 2d4b2c9e76dbb3a6625c2e550a0e9b5fd241785f
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 16:23:26 2020 +0100
clean: improve arg handling
- detect lack of options using actual arg count rather than first arg
being an empty string.
- fix string splitting issues by looping properly on "${@}"
- tidier
Gbp-Dch: Ignore
commit 2d7ff4934d721f38ac5274c866e44e20d3bda2e8
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 14:49:45 2020 +0100
improve stagefiles encapsulation
- added and used Stagefiles_dir()
- added and used Stagefile_exists()
pretty self explanatory.
Gbp-Dch: Short
commit b20979334cc28c345b2b72da30c3591fb5c85882
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 13:43:22 2020 +0100
caching: output error on invalid action param
for bootstrap, the check is moved to the case statement for greater
robustness, and for consistency with other scripts.
Gbp-Dch: Ignore
commit da1fab116139150db562eb2c104dea55b7535a33
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 13:41:01 2020 +0100
output error for incorrect action in chroot prep scripts
...alongside printing usage (which is perhaps unnecessary), so that it is
actually clear to users that a problem occurred, and what.
and capture it before option processing of remaining args.
Gbp-Dch: Ignore
commit 5f318c5a444ef05bdf79b1f7640294c7423fd10e
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 13:05:03 2020 +0100
tidy up Echo_breakage()
- it's only used by the debootstrap script after alternatives were dropped
long ago, so let's move it, avoiding it being loaded for everything
else.
- there's no need to pass printing another message through it.
- there's little point in making the sid distinction if you happen to
decide to build sid, it's a given that it's less stable than stable.
really, is there any need for this at all?
Gbp-Dch: Ignore
commit d7d0798e4681bb7f5c1a1836df854a72d2772113
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 12:54:22 2020 +0100
debootstrap: remove useless obtaining debootstrap verbose help strings
Gbp-Dch: Ignore
commit 1c74927fe5e4c715b9ec9a5fdce8506869149d83
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 12:41:35 2020 +0100
config: simplify mode default
all roads lead to debian
i was waiting to get to the work on properly tackling the mode stuff, but
let's just tidy this now...
Gbp-Dch: Ignore
commit f78001144b56993de751be78983b9d01a9d73dd7
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 02:38:26 2020 +0100
move and rename Common_config_files()
for better encapsulation, and for consistency with other config file
handling functions in the new location.
Gbp-Dch: Ignore
commit 69dc8c21cb97f155183b273bdc49d5a71f25bcb8
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 02:04:20 2020 +0100
bootloaders: tweak default splash text to avoid overlap
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
commit d4a1e110ed8560db57b2c4fbfe66df152170ba82
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat May 2 00:01:50 2020 +0100
syslinux: updated SVG for splash
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
commit 1892f97ce608b84fd1860fb97e0164c0efbf1922
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri May 1 22:35:05 2020 +0100
grub2: fix missed vga= consistency adjustment
Gbp-Dch: Ignore
commit 6ebac9cc5b3f0c79d8225ed6617ba1c8859c703b
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri May 1 21:47:31 2020 +0100
grub2: fix duplicate live entries
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
commit 578dbee516a370935e1b2e49205c524370e1f8d0
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu Jan 29 00:33:25 2015 +0000
bootloaders: change 'Advanced options' to 'Utilities'
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
commit d22c1f177d7192f1d71743783a88ed6e98e56c6a
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat Apr 4 05:11:48 2020 +0100
grub2: fix vga= consistency
- 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
commit 375ff465e5866ec8ef175ed81e75ff08a3370ba8
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat Apr 4 05:27:31 2020 +0100
grub2: tiny label consistency tweak
as per style in official Debian install discs
Gbp-Dch: Ignore
commit 0e5d0483e5596e200430d28356b808af76806439
Author: johnraff <github@rafflesnagoya.com>
Date: Fri May 1 11:23:39 2020 +0900
Replace 'which' with 'command -v' to test for the existance of an executable
This is considered to be more robust.
Two instances remain:
scripts/build/chroot_archives, line 257:
if [ "${LB_APT}" = "aptitude" ] && [ ! $(Chroot chroot "which aptitude") ]
The command is run inside a chroot where the environment might be special,
and would need further testing.
manpages/Makefile, line 42:
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
I am insufficiently familiar with makefile syntax to edit this.
commit fd18d46e0eb6abfe757f8764c65ac4c472fcdeef
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu Mar 26 04:59:15 2020 +0000
grub2|loopback: avoid perl for live entry creation, use temp file
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
commit 2c1af527fdd4e97d79267f8afb7696fe96331982
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 18:43:17 2020 +0100
config: fix wrong variable name
Gbp-Dch: Ignore
commit a72e7daaf74fbc4a67d251e5e8f9d5bfb596ba97
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 18:41:44 2020 +0100
config: only try to load FILE.ARCH and FILE.DIST if non-empty strings
to thus avoid trying to load `FILE.`
Gbp-Dch: Ignore
commit 61aa3239c5c93d6d7bdc5b9b6a407f400799779b
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 18:32:36 2020 +0100
config: remove junk config loading code
support for this has not existed since v2.0~a24-1 !!
until 4d22ca948ad3def3f98fd89d32bf2ba8209460fd (v2.0~a24-1), `PROGRAM` was
defined as `PROGRAM="$(basename ${0})"`. then this commit simply got rid
of the definition.
it then flipped back and forth a bit in a few ways, but always sticking
to a simple fixed "live-build" type string after that commit, as it has
been ever since.
the code removed here has thus been junk since then, and the documentation
corrected here out of date since then.
the checking of `LB_CONFIG` is also possibly junk, but i know too little
about it. it was introduced in v1.0~a43-1 in commit
705a4178e75ffc190acf2fa914a6cd1519fdae87 with a changelog entry of
"Centraly evaluate LH_CONFIG for custom configuration file."
Gbp-Dch: Short
commit 72321c2b9be15c68567efbfaca5ee24590a3a80a
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 12:34:33 2020 +0100
config: optimise --ignore-system-defaults
Gbp-Dch: Ignore
commit b4156e146f83474a9cb1aca9117a4a4053c62683
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu Apr 30 11:57:47 2020 +0100
workaround checkbashisms mistake
it reported: "possible bashism in scripts/build/binary_loopback_cfg line 284 (should be '.', not 'source')"
which is clearly a misidentification.
Gbp-Dch: Ignore
commit 9d5665c6274cfd1052e9c16a3a1708d8f91b58da
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat Apr 4 09:15:35 2020 +0100
syslinux: fix errors re-running under `--force`
robustification is required to not just `--force` but recovery from failure
or user cancellation.
Gbp-Dch: Short
commit 82f0acb091db1324af195935674e6e16e72d9271
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri Mar 27 21:33:59 2020 +0000
grub2|loopback: fix theme issues for submenus
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
commit 96ade65e65fb494a79400c0deaf8297c5b2ac46f
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu Apr 30 06:55:34 2020 +0100
grub2: fix lost pre-prepared files detail
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
commit 647dcb7aeddc71c9637e1487de1c3f61e49ae978
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu Apr 30 05:48:08 2020 +0100
bootstrap_cache: fix failure condition
during testing i encountered an unexpected error resulting from the
following condition:
- bootstrap was cached
- cache of bootstrap packages was empty (from playing with `lb clean`)
- installer was not none|live
everything works fine up until the main installer script, which comes to
an abrupt halt with an error due to the missing cached bootstrap packages
that it wants to copy.
this situation is easy to unintentionally create, as i managed to do.
here we catch the failure condition, correcting for it.
this is done by checking for the missing cached packages when restoring
the bootstrap from the cache, and skipping this if the packages were
missing, thus forcing the bootstrap to be rebuilt. the packages should
then be found within the cache, allowing the installer stage to complete
successfully.
of course the bootstrap stage will only cache the packages if caching is
enabled, but if caching is disabled and installer enabled, the config
validation will catch that, reporting that problem.
Gbp-Dch: Short
commit 51903da07338928e15c8c7963b18968954f4dd06
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 15:23:01 2020 +0100
init: warn if auto script exists but is not executable
commit a8a6addaf5405ed68cc6132522f09aa6bf5079e5
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Wed Mar 25 01:56:17 2020 +0000
loopback: tidy formatting
Gbp-Dch: Ignore
commit 1374e82e24aead5c827b49dd7a37e8d14dc7bf41
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Wed Apr 29 19:00:40 2020 +0100
frontend: fix passing along global args
trying to use `lb --debug config` for instance did not output debug info
unlike `lb config --debug`.
Gbp-Dch: Ignore
commit 80d9c93de9bb8dcf06fb081cbd35213e0f995833
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat Apr 25 03:25:32 2020 +0100
selinux: fix output consistency
install mode was silent when selinux was not enabled, whilst remove mode
always output a "Begin unmounting..." message. this makes both modes silent
when selinux is not enabled.
this also happens to fix an unintended side effect of
d79c96232b40fb082233c97ac8d4f75b821ecefe whereby a warning subsequently
was always emitted in remove mode when selinux was not in use, which was
not ideal.
Gbp-Dch: Short
commit 931f42fa39bd8efa364bc31af33e350de7a0b8f7
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 18:51:45 2020 +0100
manpages: more formatting fixes
make variables and options in descriptions bold
Gbp-Dch: Ignore
commit 4f765f3fc017ccfec835a14bb46479ccd87e7e1d
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 06:38:25 2020 +0100
manpages: fix outdated --distribution description
it does not depend upon --mode, it simply defaults to 'buster'.
Gbp-Dch: Ignore
commit 7149307e073f66f210c852b55cd77adf1d8b9f2a
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 06:23:18 2020 +0100
manpages: clarify --breakpoints
Gbp-Dch: Ignore
commit a0c7db975900e863355f2d025afd0361dc2d67b9
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 06:13:09 2020 +0100
manpages: clarify and correct --binary-images description
including correction of default for all architectures being fat32 not fat16
and the sparc difference no longer being relevant.
Gbp-Dch: Ignore
commit 4f82210d114c7bcba9e4f10e1f87fa5451e54455
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 06:04:58 2020 +0100
manpages: tiny clarifications and tweaks
not worth listing the specifics
mostly the following though:
- "(comma or space separated)" -> "(a comma or space separated list)"
- quoting values
Gbp-Dch: Ignore
commit 9c7e8dec72e0a285fe397a1ebef7e3be98e9dbb6
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 05:55:35 2020 +0100
manpages: fix formatting mistakes
shortoptions also emboldened
Gbp-Dch: Ignore
commit e9a88e5201a335193397ee3c2e87407cb0c18890
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 05:15:41 2020 +0100
manpages: tiny correction
"all (applicable)" -> "all"
this needed adjusting after 38a5aed0dcdf71f43cecfadc6e34c659408b6a00
don't want to confuse users
Gbp-Dch: Ignore
commit 20c43a0eb85663842f6db2e3bd0ceab3bdd923f0
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 05:03:01 2020 +0100
manpages: fix typos
"whould" -> "would"
"build" -> "built"
Gbp-Dch: Ignore
commit d2f9344b665c6a80b122338c531c077bb9b5dab8
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon Apr 27 03:48:15 2020 +0100
manpages: fix typo
"bugreport" -> "bug report"
i won't bother changing the dates just for this one.
Gbp-Dch: Ignore
commit 29ab2459c8e8f2287a968567dc6559f3f14eeb4e
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Wed Apr 29 10:26:49 2020 +0100
a couple tiny doc fixes
Gbp-Dch: Ignore
commit 6a5d42d5692374f14e6cf04e6fe6556942dce50a
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue Apr 28 15:12:17 2020 +0100
fix auto file handling regression
b4598b234c90b6d1c93bd64166d4aa46ce9388bb mistakenly stopped passing along
options to auto files.
Gbp-Dch: Ignore
commit 997a7f73f9c253a53562431b272859b8eadc5d28
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri Apr 24 01:00:20 2020 +0100
config: remove redundant validation check
this is already covered by the check above it
Gbp-Dch: Ignore
commit 70c0aa4075e2c17114556bcef6f0c9948ff35b5b
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu Apr 23 13:42:17 2020 +0100
manpages: fix typo
"Sor" -> "So"
Gbp-Dch: Ignore
commit 624e79eb8fc11d1ceeaf1b0e81f895fc0da4eebe
Author: Raphaël Hertzog <hertzog@debian.org>
Date: Sat Apr 25 10:49:35 2020 +0200
Do not overwrite splash.png if the user has provided it
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.
commit 103daf9f7ca47e6dae729e1141aa522c02e4bbd6
Author: Raphaël Hertzog <hertzog@debian.org>
Date: Sat Apr 25 10:46:26 2020 +0200
Make librsvg2-bin dependency unconditional for syslinux
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.
commit 24c2b3e119ef1b22539736ddaae1f42818c09f02
Author: jnqnfe <jnqnfe@gmail.com>
Date: Tue Feb 3 18:52:30 2015 +0000
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
commit 34a72caf494b2b4b98248ce4d54e0654dc822890
Author: Raphaël Hertzog <hertzog@debian.org>
Date: Fri Apr 24 17:56:22 2020 +0200
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 (^)
commit 47b0a623dd4ec320371508e1a0c3deaff973efd3
Author: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri Apr 24 15:51:49 2020 +0100
syslinux: fix lack of top level install option
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
commit c6428f44e38724991e4efa01c512876fbd13badc
Author: Raphaël Hertzog <hertzog@debian.org>
Date: Fri Apr 24 17:02:15 2020 +0200
Use correct variable name to detect removal step
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
live-build (1:20191221)
[PTS] [DDPO]