Commit Graph

3524 Commits

Author SHA1 Message Date
jnqnfe 055907592c cache: clarify and simplify package cache save/restore
These functions are specific to handling packages stored in the
cache, not other files. They are also always used with the same
`cache/packages.` prefix to the path.

Gbp-Dch: Short
Closes: #952916
2020-03-05 22:09:20 +00:00
jnqnfe c1dcc4dd89 aliases: simplify excessively complex In_list function
This function is never used to find multiple needles at one time.

Gbp-Dch: Short
Closes: #952915
2020-03-05 22:07:50 +00:00
Lyndon Brown 0869a890ae installer: download udebs directly from correct mirror
instead of trying all from derived mirror then falling back to parent upon
failure, which as pointed out by a message printed out can result in a
load of spurious 404 errors; actually get each udeb from the mirror it is
supposed to be retrieved from.

Partial fix for #952914, this is the last commit for it so closes it

Gbp-Dch: Short
Closes: #952914
2020-03-05 21:34:38 +00:00
Lyndon Brown b54bdd7fb1 installer: filter derived udebs from parent list
the existing logic just bundled the entire parent and derived udeb lists
together, ignoring the fact that there might thus be two instances of some
packages, and relying upon getting derived ones first and checking file
existence to avoid handling the overridden parent instances.

here we now actually filter the list of parent udebs to exclude packages
that are to be obtained from the derivative.

this enables avoiding the file existence checking

Partial fix for #952914

Gbp-Dch: Short
2020-03-05 21:34:38 +00:00
Lyndon Brown 2e3f195c38 installer: robustify udeb inclusion
move the code that checks whether a version of a given package has already
been obtained (to account for parent and derived both listing the same
package) to guard the copy from cache action also, not just the download
action.

in rare but possible scenarios it would have been possible to end up with
both the parent and derived copies of a package included.

Partial fix for #952914

Gbp-Dch: Short
2020-03-05 21:34:38 +00:00
Lyndon Brown 6997f99c9f installer: improve documentation a little
Gbp-Dch: Ignore
2020-03-05 21:34:38 +00:00
Luca Boccassi b13a61d519 Fix Lintian Warnings about changelog: day-of-week, trailing whitespace 2020-03-05 21:23:54 +00:00
jnqnfe ac4ba405df archives: deduplicate apt sourcelist file construction
Geez :O

Gbp-Dch: Short
Closes: #952889
2020-03-05 21:08:53 +00:00
Lyndon Brown cac44b28d5 echo: tidy
Gbp-Dch: Ignore
2020-03-05 21:04:23 +00:00
Lyndon Brown 450fb25fbd binary_onie: fix lack of newline on error
this script outputs a series of progressive dots as progress is made,
finally terminated with ' done.'. however if an error occurs then the
error would end up being printed directly on the end of this instead of
on a new line since newlines are not printed after each dot. this fixes
this oversight.

Gbp-Dch: Short
Closes: #952883
2020-03-05 21:04:23 +00:00
Lyndon Brown f3209fead2 binarie_onie: fix missing use of echo helpers
the '.' progress stuff has been left as is. perhaps that should be removed
since its use is inconsistent compared to other scripts?

Gbp-Dch: Short
Closes: #952882
2020-03-05 21:04:23 +00:00
Lyndon Brown c90749056f binary_iso: fix wrong echo helper
Closes: #952881
2020-03-05 21:04:23 +00:00
Lyndon Brown e13713c18e cursor: purge unused cursor functions
only a couple were in use and only by unused echo helpers which have now
themselves been removed, so nothing in this file is needed.

Partial fix for #952880

Gbp-Dch: Short
Closes: #952880
2020-03-05 21:04:23 +00:00
Lyndon Brown 73c1100c01 echo: purge unused *_running echo helpers
Partial fix for #952880

Gbp-Dch: Short
2020-03-05 21:04:23 +00:00
Lyndon Brown 06f632efdf echo: purge some unused echo helpers
Partial fix for #952880

Gbp-Dch: Short
2020-03-05 21:04:23 +00:00
Lyndon Brown 57a9428080 echo: direct warnings via echo helper to stderr 2020-03-05 21:04:23 +00:00
Lyndon Brown e3a987d977 echo: ensure output goes to stdout/stderr
all of these echo helpers are essentially 'logging' functions with output
always intended for stdout/stderr. lack of explicit stdout/stderr direction
means that their output could be captured unintentionally should they be
used within a function designed to construct a string.

Gbp-Dch: Short
Closes: #952879
2020-03-05 21:04:22 +00:00
Lyndon Brown b8e3a27324 echo: fix problem with error printing
lack of stderr directed output for the `E:` prefix meant that it would
not appear alongside the message in some use cases

Gbp-Dch: Short
Closes: #952878
2020-03-05 21:04:22 +00:00
jnqnfe a45dcf46f6 fix missing use of echo helpers
Closes: #952876
2020-03-05 21:04:22 +00:00
jnqnfe a67e01638f help/usage: fix overly complex script description handling
Closes: #952887
2020-03-05 20:48:49 +00:00
jnqnfe aa858eb2c8 binary_disk: refactor
Avoid all of the duplication for each installer case

Note, what is done for the netboot case (which was previously missing)
still needs addressing

Gbp-Dch: Short
Closes: #952865
2020-03-05 20:42:31 +00:00
Lyndon Brown 8b109ffb96 config: rename --architectures to --architecture
this has only ever supported specifying a single arch, thus was confusing
being plural

Gbp-Dch: Short
Closes: #952892
2020-03-05 20:39:53 +00:00
jnqnfe 49e4608cff chroot: fix redundant usage line
Closes: #952885
2020-03-05 20:38:36 +00:00
Lyndon Brown 0fc28da947 help/usage: fix incorrect program command
Closes: #952884
2020-03-05 20:37:57 +00:00
jnqnfe d0eb72a5ef help/usage: avoid unnecessary use of echo helpers
Closes: #952877
2020-03-05 20:37:57 +00:00
jnqnfe 5a00487872 fix capitalisation of some output messages
Closes: #952875
2020-03-05 20:36:54 +00:00
jnqnfe 512dd58240 archives: fix mount local repo comments
Closes: #952873
2020-03-05 20:36:21 +00:00
Lyndon Brown 5c3679c882 add missing shebangs to temp generated shell code files
Closes: #952863
2020-03-05 19:25:13 +00:00
Lyndon Brown 7fb46c464b chroot_dpkg: start-stop-daemon simplification
inspired by what it does for `/usr/sbin/flash-kernel`

Gbp-Dch: Short
Closes: #952891
2020-03-05 11:52:01 +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
jnqnfe 3897aac77a defaults: fix pointlessly split line error
inconsistent with all other output

Gbp-Dch: Ignore
Closes: #952874
2020-03-05 11:41:53 +00:00
Lyndon Brown 3840ac2005 memtest: better handle obsolete LB_MEMTEST value
available values currently are memtest86+|memtest86|none; "false" is
presumably handled for backwards compatibility

there is no need to handle this in individual scripts. the right place
to handle it is in Set_Defaults as now done

Gbp-Dch: Short
Closes: #952866
2020-03-05 11:39:57 +00:00
jnqnfe fcafaede19 simplify --debian-installer choices
`false` and `none` make no sense as choices for this option. Here we
replace `false` with `none`, and remove `true`.

Note that `true` was treated as an alias for netinst (see the changes to
source_disk and and binary_disk).

For backwards compatibility we still allow `true` and `false` by converting
them to `netinst` and `none` respectively, whilst printing a warning to
encourage users to move to `netinst`/`none`.

Gbp-Dch: Short
Closes: #952864
2020-03-05 11:36:55 +00:00
Lyndon Brown 6002f89b67 source: fix mistaken append instead of overwrite
Closes: #952862
2020-03-05 11:34:17 +00:00
Lyndon Brown 2511fff259 don't unnecessarily convert exit codes to strings
Closes: #952861
2020-03-05 11:33:12 +00:00
Lyndon Brown f3544ff68e installer: de-dup daily DI url
Closes: #952860
2020-03-05 11:32:14 +00:00
Lyndon Brown 95fedc81c1 help/usage: fix usage string of top level script
Gbp-Dch: Ignore
Closes: #952858
2020-03-05 11:31:09 +00:00
Lyndon Brown 36a3ba7634 fix indentation
including:
 - spaces replaced with tabs for consistency
 - alignment of `;;` in some case statements changed for consistency

Gbp-Dch: Short
Closes: #952857
2020-03-05 11:29:01 +00:00
Lyndon Brown a96107a3f1 manpage: fix missing mention of a config file
this is the last commit for the set reported as #952856 and thus closes it

Gbp-Dch: Ignore
Closes: #952856
2020-03-05 11:28:19 +00:00
Lyndon Brown cb0f943c43 manpage: better explain --distribution
some might think "distribution" refers to "debian"/"ubuntu"/"redhat"/etc

Gbp-Dch: Short
2020-03-05 11:28:19 +00:00
Lyndon Brown 09b24a5dd6 manpage: add non-free firmware note 2020-03-05 11:28:19 +00:00
Lyndon Brown ba08531da3 manpage: fix wrong description for --firmware-binary
--firmware-binary adds firmware to d-i, --firmware-chroot adds to live

Gbp-Dch: Short
2020-03-05 11:28:19 +00:00
Lyndon Brown 6b1f616824 manpage: fix typo
Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00
Lyndon Brown ace111863d manpage: clarification
"they" -> "who" (two uses of "they" referring to different things)

Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00
Lyndon Brown 569d256162 manpage: clarification
Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00
Lyndon Brown 54f19a3efe manpage: ubuntu support was dropped
...so remove obsolete mentions

Gbp-Dch: Short
2020-03-05 11:28:19 +00:00
Lyndon Brown b3f9580da2 manpage: fix missing stage mention
Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00
Lyndon Brown 54f77db4f1 manpage: document --system default
Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00
Lyndon Brown 78f361a571 manpage: clarify
Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00
Lyndon Brown 887bb3ccd5 manpage: grammar
Gbp-Dch: Ignore
2020-03-05 11:28:19 +00:00