Tiago Bortoletto Vaz
f976c384fe
Adding missing debian-installer options in lh_config --help message.
2008-08-09 03:28:06 +02:00
Antonio Terceiro
268c0dd538
Replacing file checking with ls by function calls
...
Instead of repeatedly doing "ls ... > /dev/null 2>&1", just use a
function that does exactly that.
2008-08-09 03:27:52 +02:00
Chris Lamb
a3277ebaae
Always add our apt_preference(5) pinning stanza when using local-packages.
...
This mostly reverts my most recent chroot_local-packages/preferences commit
as I found problems when re-running parts of the build: as the pinning
stanza was removed, calls to "apt-get upgrade" from within live-helper
would remove replacement packages placed in chroot_local-packages.
This isn't 100% foolproof - running apt-get upgrade on the binary image may
still attempt to remove replacement packages (heavy users of this should
probably be using their own repo for this sort of thing anyway).
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-08 21:28:52 +01:00
Chris Lamb
a5b4c4bc0d
Ensure packages in config/chroot_local-packages override all others.
...
This reverts config/chroot_local-packages to almost original semantics by
giving any package in chroot_local-packages a priority of 1001, allowing
it to "downgrade" packages and generally override the standard APT sources.
I think this follows the idea of this directory more and is likely to be
more useful with this setup - rebuilding a package simply to bump a version
number or keeping a custom apt_preferences(5) file around kinda sucks,
especially as it is often used as a temporary workaround.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-07 22:05:08 +01:00
Chris Lamb
15ee6f0eae
Test whether to use hard-links when caching d-i downloads.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-07 20:10:48 +01:00
Chris Lamb
6f870a5be2
Don't install Recommends of d-i packages.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-07 20:10:48 +01:00
Chris Lamb
2fc9cca9e8
Call "Check_defaults" in lh_build.
...
This ensures that incompatible configurations that are created by editing
files in config/ are detected when building the image via lh_build.
This also has the side-effect of ensuring that configuration warnings (if
any) appear for live-magic.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-07 20:10:48 +01:00
Chris Lamb
77498d336a
Print nicer error message when bootstrap missing from LH_CACHE_STAGES.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-07 20:10:45 +01:00
Chris Lamb
34d197833c
Remove 'E:' prefix in call to Echo_error - it gets added later too.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-08-07 19:18:43 +01:00
Daniel Baumann
80e59fb472
Only using hardlinks for local-packages when hardlinks are possible.
2008-08-07 19:45:24 +02:00
Daniel Baumann
d27f5152d3
Removing make-live legacy helper.
2008-08-07 19:39:45 +02:00
Daniel Baumann
01f8269eb3
Making check for local-patches silent.
2008-08-07 17:57:28 +02:00
Daniel Baumann
0a1a5f6da7
Making check for local-includes silent.
2008-08-06 23:28:27 +02:00
Tiago Bortoletto Vaz
5f87b22971
Improving message when using default values in /etc/default/live-helper.
2008-08-06 23:01:47 +02:00
Chris Lamb
04b0737087
Add lh_chroot_local-patches helper to apply local patches against chroot.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-31 17:12:06 +01:00
Chris Lamb
3199a409fa
Don't duplicate gtk and non-gtk kernels if they are identical.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-29 00:48:31 +01:00
Chris Lamb
2435bee4ac
Fix cache poisoning issue in lh_binary_debian-installer with 404 downloads
...
When wget 404's, an target file is created - this poisons the cache as the
file is apparently downloaded but in actuality is simply empty. We fix this
by unconditionally deleting the cache file if wget fails and emitting an
error.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-26 00:27:29 +01:00
Chris Lamb
364ed4e362
Don't attempt to use live-installer on Etch; it would simply result in no bootstrap method.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-26 00:21:25 +01:00
Chris Lamb
db756ce6c6
Cache d-i kernel, initrd and mini.iso downloads ( Closes : #492085 )
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-24 05:48:47 +01:00
Chris Lamb
1b0a6b7420
Wrap most calls to wget in lh_binary_debian-installer.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-24 05:47:08 +01:00
Daniel Baumann
5d2cdbe5c6
Using rfc2606 invalid tld instead of dummy.
2008-07-15 09:33:27 +02:00
Daniel Baumann
e8f45391ba
Using better suited variable name for live-helpers local key.
2008-07-15 09:32:30 +02:00
Chris Lamb
16a45783e1
Additionally clean md5sum.txt temporary file.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-13 02:43:58 +01:00
Chris Lamb
ee29509120
Remove pointless whitespace.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-13 02:42:55 +01:00
Chris Lamb
bb897a80a5
Temporarily replace /dev/urandom with /dev/random when creating local packages key.
...
This avoids blocking automated mage builds; we don't care about the
security of this key anyway.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-13 02:42:46 +01:00
Chris Lamb
03ad96281e
Correct d-i kernel and initrd locations in grub entries. Thanks to Jun NOGATA <nogajun@gmail.com> for the patch. ( Closes : #490245 )
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-11 00:37:51 +01:00
Chris Lamb
3aa34e3461
Fix a bug where a /etc/apt/preferences supplied in chroot_local-includes was always being deleted when used in conjunction with config/chroot_apt/preferences.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-10 21:54:02 +01:00
Chris Lamb
04841d46ad
Abort build if working directory contains spaces - not supported by (at least) debootstrap and cdebootstrap.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-10 05:13:57 +01:00
Chris Lamb
78d346e90c
Replace spaces in LH_BOOTSTRAP_{IN,EX}CLUDE variables with commas on use. Thanks to Cyril Brulebois <cyril.brulebois@kerlabs.com>. ( Closes : #490114 )
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-10 00:24:07 +01:00
Chris Lamb
e0160b3eaf
Fix syntax error in --ignore-system-defaults handling.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-09 15:40:57 +01:00
Chris Lamb
77e3602fa4
Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-09 15:40:39 +01:00
Chris Lamb
9f96103510
Fix bug where command-line argument --ignore-system-default was not seen before it was required.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-09 04:59:23 +01:00
Chris Lamb
0b38353a81
Fix formatting error with --ignore-system-defaults in "lh_config --help"
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-09 04:55:10 +01:00
Chris Lamb
2de3396734
Add --ignore-system-defaults option to not source /etc/default/live-helper.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-09 00:13:09 +01:00
Chris Lamb
3205bb9409
Use a temporary apt key when installing local packages ( Closes : #488257 )
...
This patch also allows preferring locally provided packages by preferencing
repositories with the label 'local-packages' in chroot_apt/preferences.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-05 00:40:20 +01:00
Chris Lamb
3b540b4c4f
Fix caching of APT indices ( Closes : #478744 )
...
I've tested this the cross-product of LH_APT={apt,aptitude} and
LH_APT_SECURE={enabled,disabled} with no problems.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-04 22:29:43 +01:00
Chris Lamb
3feafc9a70
Refactor d-i GTK image selection, ensuring the GTK installer is only chosen on the netboot variant when building on powerpc.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-04 22:28:20 +01:00
Chris Lamb
6c11528829
Only consider linux-image-2.6-prep powerpc kernel image on Etch.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-04 22:26:35 +01:00
Chris Lamb
70925408b6
Refactor remote d-i location handling and ensure correct locations for powerpc.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-07-04 22:25:47 +01:00
Chris Lamb
627de6d41e
Re-order a case statement for consistency.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 11:37:02 +01:00
Chris Lamb
d0f57376eb
Fix incorrect test for sparc architecture in binary include handling.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 11:36:15 +01:00
Chris Lamb
bcd8472821
Add support for generation of sparc netboot images.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:38:21 +01:00
Chris Lamb
6d9de44806
Add support for sparc "tar" binary image type.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:37:47 +01:00
Chris Lamb
21d51d04f9
Add support for sparc install includes.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:35:18 +01:00
Chris Lamb
ec998961a8
Refactor destination setting in lh_binary_silo to check arguments at beginning of the script.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:35:07 +01:00
Chris Lamb
5bee701f29
Abort build if building from the root directory (/) as this causes misc build failures.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:33:49 +01:00
Chris Lamb
8fed454c06
Emit a warning when running lh_build without a config/ directory.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:33:15 +01:00
Chris Lamb
c05c115684
Migrate a few uses of grep to In_list.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-20 01:31:21 +01:00
Chris Lamb
da4672b5d5
Remove a useless space
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-19 22:02:37 +01:00
Chris Lamb
daec955a09
Consolidate grep text searching predicates to use "grep -qs"
...
If this is deemed not portable enough in the future, it should be easy
enough to find/replace.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-06-19 19:49:16 +01:00