98cb61600c
Passing -wildcards to mksquashfs call when having excludes, thanks to Phillip Lougher <phillip@lougher.demon.co.uk>.
2011-03-09 19:03:40 +01:00
dbcc5dc8b3
Fixed 2 typos in getopt longoptions string.
2011-03-09 19:03:40 +01:00
ef222396cd
Introducing config/binary_rootfs/excludes as a generic way to exclude files manually from the binary image.
2011-03-09 19:03:40 +01:00
5fe8b202c3
Since #433076 is fixed in live-initramfs, we only need to adjust owner of the live-user when using casper for etch builds.
2011-03-09 19:03:40 +01:00
fa8e9f9381
Renaming sections to categories in order to use the same names as Debian Policy does ( Closes : #483777 ).
2011-03-09 19:03:40 +01:00
14fe5c6fb2
Improving check for a mounted chroot/dev/pts to cover all terminals, not just the 0th ( Closes : #459697 , #459779 ).
2011-03-09 19:03:40 +01:00
a12a4b71fb
Support expanding wildcards in udeb excludes.
...
This was preventing "kernel-image-*" "exclude" entries from removing these
packages. This saves about 5 MiB of space in all.
2011-03-09 19:03:40 +01:00
b6a9ccaa08
Remove pointless whitespace.
2011-03-09 19:03:40 +01:00
3ef5610890
Removing surrounded braces from LH_BOOTAPPEND_INSTALL - it is expanded by sed, not the shell.
2011-03-09 19:03:40 +01:00
c4c0f319ae
Correcting typo LH_BOOTSTRAP_INSTALL -> LH_BOOTAPPEND_INSTALL in Grub kernel parameters.
2011-03-09 19:03:40 +01:00
6018c34eda
Correct bogus path for d-i preseed files.
2011-03-09 19:03:40 +01:00
59e050290d
Don't install lists from chroot_local-packageslists without them being specified in LH_PACKAGES_LISTS ( Closes : #490755 )
2011-03-09 19:03:40 +01:00
b070f0a9a3
Preserve changed apt settings (pdiffs, recommends, and secure) in binary image ( Closes : #494640 ).
2011-03-09 19:03:40 +01:00
1a8e869265
Remove accidental trailing '"' (quote) package from lh_config usage.
2011-03-09 19:03:39 +01:00
8888135805
Updating chroot hacks to reflect namechange of the udev persistent rules.
2011-03-09 19:03:39 +01:00
7e20d93cf5
Correcting typo in win32-loader config.
2011-03-09 19:03:39 +01:00
5b882c2b34
Making lh_chroot_interactive and lh_source_usb-hdd messages translatable.
2011-03-09 19:03:39 +01:00
049d0abfca
Making lh_binary_usb-hdd messages translatable.
2011-03-09 19:03:39 +01:00
3e3bb42607
Moving win32-loader inclusion support from external hook into main program ( Closes : #476546 ).
2011-03-09 19:03:39 +01:00
2bec7369f1
Removing currently unused help message in lh_config.
2011-03-09 19:03:39 +01:00
afc3dc8166
Tidy "install" / "install-binary" handling in lh_chroot_apt.
2011-03-09 19:03:39 +01:00
3732c2c4bb
Add informational comments to generated /etc/apt/preferences stanzas.
2011-03-09 19:03:39 +01:00
1010bcc390
Generate Release file for chroot_local-packages when APT_SECURE is disabled.
...
This was preventing the pinning mechanism to work when it security was
disabled.
2011-03-09 19:03:39 +01:00
445de4d80a
Prevent (harmless) duplicate entries appearing in /etc/apt/preferences
2011-03-09 19:03:39 +01:00
aa6204c8ae
Also allowing multiple preseeding files for netboot.
2011-03-09 19:03:39 +01:00
384a050c79
Adding guessing of the preseeding filename, and way to manually overwrite it (or select it in case of multiple available preseeding files).
2011-03-09 19:03:39 +01:00
eae542daba
Allowing to use more than one preseeding file to be on the media.
2011-03-09 19:03:39 +01:00
36929d2172
Ensure the binary image does not inherit the binary stage's APT settings.
2011-03-09 19:03:39 +01:00
1adae413a4
Always create stagefile for chroot_install-packages and require it for lh_source
...
This is required as lh_source will generate an incomplete source tarball if
only the bootstrap phase has been completed.
2011-03-09 19:03:38 +01:00
765b7bb72d
Correct indentation of conditional code.
2011-03-09 19:03:38 +01:00
ddc31653d7
Clean source.list instead of binary.list when calling lh_clean --source.
2011-03-09 19:03:38 +01:00
6205a24620
Adding last modifications in order to have localization fully working in live-helper. This commit goes with some pt_BR translations just for testing. Thanks to Antonio Terceiro for helping and coding in some shell stuff.
2011-03-09 19:03:38 +01:00
c7bccbbf26
Add busybox to DI_PACKAGES as its required to install kernels.
2011-03-09 19:03:38 +01:00
aa9c076df9
Choose correct d-i install method for "live" and usb-hdd/tar image types.
2011-03-09 19:03:38 +01:00
974e737b62
Don't duplicate .debs of packages in binary/pool that are installed via live-installer.
...
This saves about 80MiB of space when building LH_DEBIAN_INSTALLER="live".
2011-03-09 19:03:38 +01:00
4dc5c74e05
Create pool/main to prevent build failure when no local .debs are queued for installation.
2011-03-09 19:03:38 +01:00
a1c4763a02
Don't include the bootstrap .debs on live-installer based disks (saves ~30MiB).
2011-03-09 19:03:38 +01:00
d6053a8103
Rework WGET_OPTIONS and use "--no-verbose" by default (just prints the URL).
2011-03-09 19:03:38 +01:00
1edb9bd7c8
Fix "lh_config -c". Thanks to Simon Schiele <lists@codingmonkey.de>.
2011-03-09 19:03:38 +01:00
7bd69bd567
Remove --debian-installer-daily from getopt call.
2011-03-09 19:03:38 +01:00
7245d22f24
Fix a bug in chroot_local-packages where packages were upgraded with themselves during lh_binary stages.
2011-03-09 19:03:38 +01:00
74ef06a44e
Fix bug in LH_DEBIAN_INSTALLER_DISTRIBUTION = "daily" handling.
...
Was causing build failures as it was trying to download files from a
"daily" component of a mirror.
2011-03-09 19:03:38 +01:00
28121b6662
Disabling call to "update-initramfs" in lh_chroot_hacks.
...
Users who are modifying initramfs scripts via chroot_local-includes
should really run update-initramfs themselves - this wasn't possible until
fairly recently due to re-ordering of calls from lh_chroot.
2011-03-09 19:03:38 +01:00
ba25e433b5
Merging debian-installer-daily option into debian-installer-distribution.
2011-03-09 19:03:38 +01:00
17ca582c93
Minor typo fix for encryption parameter in lh_config help message.
2011-03-09 19:03:38 +01:00
2acf049825
Suporting debian-installer distribution choice, which makes possible to build a image using a system-independent debian-installer suite. The config option for this is --debian-installer-distribution CODENAME.
2011-03-09 19:03:38 +01:00
36f8ceb644
Adding missing debian-installer options in lh_config --help message.
2011-03-09 19:03:37 +01:00
7f1a4e4fc5
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.
2011-03-09 19:03:37 +01:00
382d244050
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).
2011-03-09 19:03:37 +01:00
bb56b10384
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.
2011-03-09 19:03:37 +01:00
6538fac66f
Test whether to use hard-links when caching d-i downloads.
2011-03-09 19:03:37 +01:00
38a545b3d1
Don't install Recommends of d-i packages.
2011-03-09 19:03:37 +01:00
c0d2b4ef05
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.
2011-03-09 19:03:37 +01:00
bd4a6204bb
Print nicer error message when bootstrap missing from LH_CACHE_STAGES.
2011-03-09 19:03:37 +01:00
2da3bcef16
Remove 'E:' prefix in call to Echo_error - it gets added later too.
2011-03-09 19:03:37 +01:00
b13a8381a4
Only using hardlinks for local-packages when hardlinks are possible.
2011-03-09 19:03:37 +01:00
b4c24e4136
Removing make-live legacy helper.
2011-03-09 19:03:37 +01:00
698992351c
Making check for local-patches silent.
2011-03-09 19:03:37 +01:00
4b7b96bce8
Making check for local-includes silent.
2011-03-09 19:03:37 +01:00
8eb8c921d6
Improving message when using default values in /etc/default/live-helper.
2011-03-09 19:03:37 +01:00
d58eaafd5a
Add lh_chroot_local-patches helper to apply local patches against chroot.
2011-03-09 19:03:37 +01:00
b9c6f0a083
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.
2011-03-09 19:03:37 +01:00
1b37572080
Don't attempt to use live-installer on Etch; it would simply result in no bootstrap method.
2011-03-09 19:03:37 +01:00
2a2668aef9
Cache d-i kernel, initrd and mini.iso downloads ( Closes : #492085 )
2011-03-09 19:03:37 +01:00
877603ae02
Wrap most calls to wget in lh_binary_debian-installer.
2011-03-09 19:03:37 +01:00
4ca717c428
Using rfc2606 invalid tld instead of dummy.
2011-03-09 19:03:37 +01:00
8b2ee102d2
Using better suited variable name for live-helpers local key.
2011-03-09 19:03:37 +01:00
a74d37bdc0
Additionally clean md5sum.txt temporary file.
2011-03-09 19:03:37 +01:00
a00b0987a9
Remove pointless whitespace.
2011-03-09 19:03:37 +01:00
5686484347
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.
2011-03-09 19:03:37 +01:00
1985ada3a9
Correct d-i kernel and initrd locations in grub entries. Thanks to Jun NOGATA <nogajun@gmail.com> for the patch. ( Closes : #490245 )
2011-03-09 19:03:37 +01:00
22f8d1cf18
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.
2011-03-09 19:03:37 +01:00
dd074f1461
Abort build if working directory contains spaces - not supported by (at least) debootstrap and cdebootstrap.
2011-03-09 19:03:36 +01:00
cb7809fc83
Replace spaces in LH_BOOTSTRAP_{IN,EX}CLUDE variables with commas on use. Thanks to Cyril Brulebois <cyril.brulebois@kerlabs.com>. ( Closes : #490114 )
2011-03-09 19:03:36 +01:00
b6e8bde6d5
Fix syntax error in --ignore-system-defaults handling.
2011-03-09 19:03:36 +01:00
0e0c22cb6f
Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
2011-03-09 19:03:36 +01:00
5883931966
Fix bug where command-line argument --ignore-system-default was not seen before it was required.
2011-03-09 19:03:36 +01:00
6e64be0c82
Fix formatting error with --ignore-system-defaults in "lh_config --help"
2011-03-09 19:03:36 +01:00
c907da2ad1
Add --ignore-system-defaults option to not source /etc/default/live-helper.
2011-03-09 19:03:36 +01:00
bb528d9f19
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.
2011-03-09 19:03:36 +01:00
ad5c5bc2c7
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.
2011-03-09 19:03:36 +01:00
e4e77a0c91
Refactor d-i GTK image selection, ensuring the GTK installer is only chosen on the netboot variant when building on powerpc.
2011-03-09 19:03:36 +01:00
e7b0c3b78a
Only consider linux-image-2.6-prep powerpc kernel image on Etch.
2011-03-09 19:03:36 +01:00
19039961c8
Refactor remote d-i location handling and ensure correct locations for powerpc.
2011-03-09 19:03:36 +01:00
412ac01000
Re-order a case statement for consistency.
2011-03-09 19:03:36 +01:00
a46e647710
Fix incorrect test for sparc architecture in binary include handling.
2011-03-09 19:03:36 +01:00
730cf9e4eb
Add support for generation of sparc netboot images.
2011-03-09 19:03:36 +01:00
9f1a88d0d9
Add support for sparc "tar" binary image type.
2011-03-09 19:03:36 +01:00
fd9c9df5a8
Add support for sparc install includes.
2011-03-09 19:03:36 +01:00
468838fdad
Refactor destination setting in lh_binary_silo to check arguments at beginning of the script.
2011-03-09 19:03:36 +01:00
1271828d6d
Abort build if building from the root directory (/) as this causes misc build failures.
2011-03-09 19:03:36 +01:00
9fba09b735
Emit a warning when running lh_build without a config/ directory.
2011-03-09 19:03:36 +01:00
5e310e0fca
Migrate a few uses of grep to In_list.
2011-03-09 19:03:36 +01:00
f24582d59d
Remove a useless space
2011-03-09 19:03:35 +01:00
988db3ba49
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.
2011-03-09 19:03:35 +01:00
5f3168deb7
Revert aborting live d-i installation if minimal/stripped is selected and instead attempt to not break the chroot too much in this case
2011-03-09 19:03:35 +01:00
a5e675792a
Replace another unweildy "if P1 || P2" statement with its "case" equivalent.
2011-03-09 19:03:35 +01:00
8474de1d65
Remove more imported whitespaces.
2011-03-09 19:03:35 +01:00
519d7c17cd
Adjust "lh_config --help" and lh_config(1) so that the -m option corresponds with --mirror-bootstrap isntead of --mirror-binary-security.
2011-03-09 19:03:35 +01:00
444ef13a69
Removing imported whitespaces.
2011-03-09 19:03:35 +01:00
369fd95bee
Only deference symlinks on usb-hdd filesystems that do not support symlinks.
2011-03-09 19:03:35 +01:00
51a75d515a
Add support for ext2 and ext3 to lh_source_usb-hdd.
2011-03-09 19:03:35 +01:00
cc8092771e
Add support for usb-hdd on sparc (requires parted 1.8 from experimental).
2011-03-09 19:03:35 +01:00
c96228be81
Refactor mkfs handling.
2011-03-09 19:03:35 +01:00
36f737b756
Refactor partition table type handling.
2011-03-09 19:03:35 +01:00
f5dc49aaeb
Refactor partition type handling.
2011-03-09 19:03:35 +01:00
1edb371113
Prefix mount and unmount in lh_binary_debian-installer with LH_ROOT_COMMAND.
2011-03-09 19:03:35 +01:00
336687882c
Add support for sparc to lh_binary_debian-installer.
2011-03-09 19:03:35 +01:00
d4f70af91b
Add support for the sparc architecture.
2011-03-09 19:03:35 +01:00
1acc8f8b0b
Add lh_binary_silo and associated templates to support the SILO bootloader.
2011-03-09 19:03:35 +01:00
a26d1c55e1
Ensure apt-utils is installed in the helpers it is required.
...
This allows us to remove a hacky test from hooks/minimal to see whether
we need the package.
2011-03-09 19:03:35 +01:00
5cb3a1a800
Abort if "live" d-i installation is attempted with minimal or stripped LH_PACKAGES_LISTS
...
This is required because lh_binary_rootfs removes /boot if minimal or
stripped is the only packages list.
2011-03-09 19:03:35 +01:00
e7b3cabbd7
Fix d-i locations in yaboot entries.
2011-03-09 19:03:35 +01:00
7b881914d4
Fix trivial typographic error ("flavor" => "flavour")
2011-03-09 19:03:35 +01:00
21592c73bc
Only deference symlinks on FAT{16,32} partitions on usb-hdd.
2011-03-09 19:03:35 +01:00
f662127928
Revert always deferencing symlinks when installing some binary includes.
2011-03-09 19:03:35 +01:00
600d183d29
Add Echo_breakage for messages preceeding often-breaking stages and use before {c,}debootstrap calls
2011-03-09 19:03:35 +01:00
243ee8a6d3
Replace a few unweildy "if" statements with their "case" equivalents
2011-03-09 19:03:35 +01:00
85493ae3b2
Move Etch syslinux workaround closer to the original definitions
2011-03-09 19:03:35 +01:00
1bd10cea37
Use correct location of powerpc d-i images.
2011-03-09 19:03:35 +01:00
4d748e582c
Set correct d-i image type on usb-hdd and tar image types
2011-03-09 19:03:35 +01:00
4950924195
Remove pointless "echo" statements pre- and post- cdebootstrap
2011-03-09 19:03:35 +01:00
991139e0f6
Allow LH_APT_SECURE to disable package cdebootstrap package authentication
2011-03-09 19:03:34 +01:00
25ad66e62d
Rename USE_NETBOOT_DI to DI_IMAGE_TYPE
2011-03-09 19:03:34 +01:00
a1caf63a92
Always deference symlinks when installing some binary includes to fix breakage on amd64.
2011-03-09 19:03:34 +01:00
41638d7921
Ensure "Using system defaults" message appears when calling lh_config without --verbose
2011-03-09 19:03:34 +01:00
01a611b24d
Don't skip single dot-files in the root directory of binary and chroot local includes
2011-03-09 19:03:34 +01:00
7540b66682
Don't exclude live-installer when LH_DEBIAN_INSTALLER=live
2011-03-09 19:03:34 +01:00
90d2fedc09
Fix a few bogus guards in lh_binary_debian-installer
2011-03-09 19:03:34 +01:00
e6b633314e
Parsing local arguments to lh_config last.
2011-03-09 19:03:34 +01:00
76319632a1
Correcting order where system-wide lh_config defaults file is read, thanks to Juergen Fiedler <juergen.fiedler@gmail.com>.
2011-03-09 19:03:34 +01:00
4c4e58ca20
Only saving source indices to indices cache if source indices are actually existing, thanks to Thanatermesis <thanatermesis.ecvs@elivecd.net>.
2011-03-09 19:03:34 +01:00
11883b9f46
Correcting path for system-wide lh_config defaults file.
2011-03-09 19:03:34 +01:00
80a2f25b02
Added support for /etc/live-helper.
...
* lh_config system-wide configuration file, like an implicit specification
of '--conffile=/etc/live-helper' to each lh_config call.
2011-03-09 19:03:34 +01:00
2b287d6b6c
Removed a useless space.
2011-03-09 19:03:34 +01:00
b067d159ec
Create chroot_local-preseed/ directory when building config/ in lh_config
2011-03-09 19:03:34 +01:00
ae58d0f7af
Producing rsyncable tarballs where possible.
2011-03-09 19:03:33 +01:00
ac27ecc2e0
Allow fallback to chroot_package-lists inside binary lists
...
Without this, a modified version of the (say) "gnome" list inside
chroot_package-lists would be completely ignored when installing binary
packagelists.
2011-03-09 19:03:32 +01:00
efa7c76589
Remove temporary binary package list files
2011-03-09 19:03:32 +01:00
ffa20df082
Tidy calls to new Expand_packagelist
2011-03-09 19:03:32 +01:00
002c79ef51
Some formating and style cleanups.
2011-03-09 19:03:32 +01:00
cc3c1ff10d
Using one single packages cache directory for all chroot packages.
2011-03-09 19:03:32 +01:00
7bcdcf7f05
Using hardlinks to copy local packages into chroot.
2011-03-09 19:03:32 +01:00
d23cf256e8
Moving lh_chroot_packages call in lh_chroot to old place.
2011-03-09 19:03:32 +01:00
36cc525945
Install most chroot packages in one ${LH_APT} call ( Closes : #475739 )
...
This patch installs (almost) all chroot packages by queueing the package
names into a single file and then installing that. It depends on my
previous patch to install local packages by using an APT mirror.
This speeds up image build causes even greater speedups once more packages
adopt triggers.
(Packages installed by debconf preseeding are not touched, nor are packages
installed by tasks.)
2011-03-09 19:03:32 +01:00
ae785955db
Install local packages using a local APT repo instead of using "dpkg -i"
...
This patch modifies chroot_sources to build a small APT repo of the
local-packages and use that for local package installation instead of
"dpkg -i". This has a few advantages:
* Removes the true ugliness that is "dpkg -i *.deb && apt-get install -f".
This not only is slow and brittle, it causes scary "dpkg dependency
error" messages to appear in build logs.
* We can (ie. not implemented here) move to installing all the packages
from:
- lh_chroot_packages (ie. ${LH_PACKAGES})
- lh_chroot_local-packages (ie. config/chroot_local-packages/*.deb)
- lh_chroot_local-packageslists
- lh_chroot_packages-lists
- lh_chroot_linux-image
.. in one shot. This would primarily improve speed as we would not keep
invoking ${LH_APT}, and package installations can share triggers and
suchlike -- installing a custom live-initramfs via local packages
currently costs an additional "update-initramfs -u" call.
It would also fix a number of obscure dependency cases, such as the one
documented in #475739 , and--if the user is using aptitude--may even
result in better resolution choices.
* Removes some messy and somewhat brittle code in lh_chroot_linux-image
that edgecases a local live-initramfs.
The disadvantages are:
* If local packages are being used and we are building in a chroot, we
must refresh the sources list and rebuild the repo before building the
binary images. (However, before this patch, we had to do this anyway if
the binary mirrors were different from the chroot ones.)
* We must add a little hack to the minimal hook to detect whether we are
using local packages and not remove apt-utils (which creates the
repository in lh_chroot_sources) if that is the case -- we cannot simply
use "Install_package" inside lh_chroot_sources as we are not guaranteed
to have working APT data because the minimal hook deliberately removes
them!
2011-03-09 19:03:32 +01:00
001bb75189
lh_chroot_local-preseed: fix minor typo
2011-03-09 19:03:32 +01:00
46e2a3271b
lh_binary_debian-installer: Add dependency on 'wget'
...
The 'minimal' hook removes wget, which is used extensively by the Debian
Installer hook.
2011-03-09 19:03:32 +01:00
0e8c38206d
Fix a number of issues with Syslinux templates ( Closes : #476204 )
...
This fixes:
* The ugly "toboot" and "to\nboot" problems
* Mistitled F4 page
* Ugly line-breaking of Debian Live URL
2011-03-09 19:03:32 +01:00
90be1cb4b5
Use "find -path" for matching "path/to/file" files ( Closes : #476206 )
...
This means that /isolinux/isolinux.bin and /boot/grub/stage2_eltorito are
not included in md5sum files anymore as intended. It also prevents a
strange and verbose warning from appearing in build logs.
2011-03-09 19:03:32 +01:00
cb88778a23
Fix quoting when installing local packages ( Closes : #470683 )
...
This was causing problems when building a package and there were binary
packages in the directory above 'config/'. See [0] and [1] for more info.
[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=463406
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476294
2011-03-09 19:03:32 +01:00
b0a4988bb7
Fix typo in policy-rc.d
2011-03-09 19:03:32 +01:00
5fe14264e0
Sorting image file lists.
2011-03-09 19:03:32 +01:00
ef1b163040
Creating binary and source file lists in build directory.
2011-03-09 19:03:32 +01:00
e296deef49
Also copying binary package list to build directory.
2011-03-09 19:03:32 +01:00
ea154f8609
Also adding a packages.txt when building etch images, although there is a casper/filesystem.manifest already.
2011-03-09 19:03:32 +01:00
c3462bceab
lh_chroot_linux-image: Catch missing case in local live-initramfs handling
...
This patch catches the case when LH_APT is "apt", its default value. This
was causing build failures when using a local live-initramfs .deb.
2011-03-09 19:03:32 +01:00
50e21abdb5
helpers/lh_config, functions/defaults.sh: Correct "boostrap" -> "bootstrap"
2011-03-09 19:03:32 +01:00
c37435dcc5
Sort md5sum.txt files again after filename.
2011-03-09 19:03:32 +01:00
ce7388dc68
Updating help output of lh_config.
2011-03-09 19:03:32 +01:00
74030ce0a6
Applied patch from Erwan Le Gall <elegall@linagora.com> to give a warning when installing local packages with wrong naming scheme.
2011-03-09 19:03:32 +01:00
26fc30d8eb
Using new Read_conffile(); now.
2011-03-09 19:03:31 +01:00
c6b83b1fd3
Adding 'all' configuration file.
2011-03-09 19:03:31 +01:00
5b24b59576
Fixing md5sum.txt creation to not fail on filenames with whitespaces, thanks to Bas Wijnen <wijnen@debian.org> ( Closes : #469085 ).
2011-03-09 19:03:31 +01:00
120528e1a2
lh_chroot_hacks: Ensure initrds are group- and world- readable
...
The loop-aes-utils sets a umask in its update-initramfs configuration,
causing initrds to have "0600" permissions which causes boot failures
when offering the files over netboot or similar.
The justification given by loop-aes is that, as it supports encrypting
against embedded GPG keyrings, the keys would be compromised if the files
were group- or world- readable. However, as live-helper does not support
this feature, it is safe to simply correct the permissions.
2011-03-09 19:03:30 +01:00
55472e6557
Allow LH_ENCRYPTION="disabled" to disable encryption
2011-03-09 19:03:29 +01:00
13625df75c
lh_binary_encryption: Rework and fix broken AES encryption routines
2011-03-09 19:03:28 +01:00
322d45eeaf
lh_binary_rootfs: Remove
...
mksquashfs has a nasty habit of segfaulting when creating an image where
an image already exists. This can happen, for example, if you are
performing multiple runs of lh_binary and the build breaks for some reason.
This is almost certainly a bug in mksquashfs; I will look into finding a
suitable testcase.
2011-03-09 19:03:27 +01:00
679aed6441
lh_binary_debian-installer: Preseed by repacking initrd in some situations
...
This patch repacks the initrd when using the d-i netboot images in order
to incorporate a preseed.cfg if it exists. Before this patch, preseeding
of d-i netboot images was not possible.
Repacking the initrd has the additional advantage of being able to preseed
the first few questions of the installation process.
2011-03-09 19:03:26 +01:00
6057ecbd19
lh_binary_debian-installer: Merge pool/netboot determining logic
...
The code which determined whether to use the netboot d-i images was the
inverse of the code which determined whether to create a local package
pool: this patch merges the two.
This patch additionally ensures that setting "businesscard" whilst building
an ISO image will install the d-i netboot images; this was causing d-i
failures when it couldn't find its (non-existent) package pool.
2011-03-09 19:03:24 +01:00
07c3a04027
lh_binary_debian-installer: Remove "local"-oriented bashisms
2011-03-09 19:03:23 +01:00
6e9f8956ee
lh_chroot_linux-image: Install dependencies differently when using aptitude
...
We must use "aptitude install <pkgname>" to install dependencies of a
dpkg-installed <pkgname>, or aptitude's resolver will remove it. apt-get
does not have this "feature".
This was causing a problem when using a custom versions of live-initramfs
as they would be removed, causing a boot failure.
2011-03-09 19:03:21 +01:00
02a9e29e09
lh_binary_debian-installer: Don't use --no-clobber for downloading files
...
Using --no-clobber at the same time as -O<file> results in <file> being
created with no contents, which was resulting in (broken) zero-byte d-i
kernels and initrds.
The patch is simple -- simply remove --no-clobber: wget -O<file> <url> will always download <url> to <file>, regardless of how
many times it is run.
2011-03-09 19:03:20 +01:00
25ac96ed14
lh_binary_debian-installer: Only create package pools when necessary
...
There is no need to create a package pool when creating a netboot Debian
Live image or when the LH_DEBIAN_INSTALLER is set to "businesscard".
2011-03-09 19:03:19 +01:00
dd77597ac8
lh_binary_debian-installer: Re-enable d-i on netboot images
...
This patch also modifies the configuration logic to ensure that setting
LH_DEBIAN_INSTALLER="enabled" whilst creating a netboot image will install
the netboot variety of d-i.
2011-03-09 19:01:54 +01:00
7c99543227
Correcting wrong logic on handling secure apt.
2011-03-09 19:01:50 +01:00
bacd270f71
Fixing wrong debian-installer auto target configuration.
2011-03-09 19:01:47 +01:00
ed5d8c3b69
Re-adding quiet on all d-i install targets in post-etch, except expert (and keeping Chris fixed quiet handling).
2011-03-09 19:01:46 +01:00
df8e958021
Don't append 'quiet' kernel parameter in rescue modes
2011-03-09 19:01:44 +01:00
f1cb2b0432
Ensure syslinux entry names match templates and standard d-i names
...
This patch alters the syslinux labels to follow the "expert" and
"expertgui" style in favour of "TextExpert" and "GUIExpert".
This makes the names match Live Helper's syslinux templates, as well as the
more typical d-i installations and numerious sources that claim that one
should "just type 'expert' at the syslinux prompt", etc.
2011-03-09 19:01:42 +01:00
c5a91189a0
Updating copyright years to 2008.
2011-03-09 19:01:41 +01:00
0904d6b37d
Also handling ext3 in lh_binary_rootfs, thanks to Bas Wijnen <wijnen@debian.org> ( Closes : #468902 ).
2011-03-09 19:01:33 +01:00
1268b8b957
Making usb-hdd images large enough ( Closes : #468855 ).
...
When building a very minimal live system on a usb-hdd target, the generated
image is too small. A very minimal system is smaller than 50MB, and so this is
the same as DU_DIM for such a system. This is too small. Unconditionally adding
one solves the problem.
2011-03-09 19:01:31 +01:00
20da312cd1
Use ${*} instead of ${@} for checking for no arguments in lh_clean.
...
${@} expands to "<arg1>" "<arg2>" ... etc., which causes the -z test to
encounter too many arguments and thus fail with an error.
2011-03-09 19:01:30 +01:00
f23072923e
Adding temporary hack to remove fstab when using live-installer.
2011-03-09 18:36:19 +01:00
9ffb223d70
Adding --jffs2-eraseblock parameter.
...
Marco sais, that flash devices often need a different erase size than mkfs.jffs2
defaults to. Hence, this parameter passes the blocksize to the mkfs.jffs2 call
through --eraseblock option.
2011-03-09 18:36:19 +01:00
5330b557ac
It's actually enough to just truncate kernel-img.conf and also less invasive than including a default configuration.
2011-03-09 18:36:19 +01:00
979c71fd6e
Including default kernel-img.conf in live-systems.
2011-03-09 18:36:18 +01:00
2b086405f9
Using wildcards to support more than one preseeding file.
2011-03-09 18:36:17 +01:00
d78a97a521
Honor local preseeding file for debian-installer.
2011-03-09 18:36:17 +01:00
a74fb24d5e
Fixing typo in sed call to set isolinux splash file.
2011-03-09 18:36:16 +01:00
2b6c057b1c
Added forgotten getopts arguments for chroot mirror.
2011-03-09 18:36:15 +01:00
3c0d008c79
When a wrong argument is passed, that argument should be listed ( Closes : #468201 ).
2011-03-09 18:36:14 +01:00
0c9fc8846d
Adding option to set binary-net compression (or disable it).
2011-03-09 18:36:13 +01:00
5ce2688675
Re-adding additional indices updated, otherwise we wouldn't honor thirdparty repositories (anymore).
2011-03-09 18:36:09 +01:00
b0c38d67e2
Renaming LH_MIRROR_BOOTSTRAP* to LH_MIRROR_CHROOT and introducing dedicated LH_MIRROR_BOOTSTRAP for debootstrap/cdebootstrap only.
2011-03-09 18:36:07 +01:00
953a3d1af6
Renaming extra bootstrap indices to chroot.
2011-03-09 18:36:06 +01:00
09f88a6e38
Adding apt/aptitude options.
...
By using APT_OPTIONS and APTITUDE_OPTIONS in config/common,
one can manipulate the default options wich is made to each
and every apt and aptitude call.
2011-03-09 18:36:05 +01:00
1ffce292fb
lh_binary_rootfs: add support to generate jffs2 filesystem
2011-03-09 18:36:05 +01:00
5d3c850ccb
lh_binary_encryption: add jffs2 as not supported filesystem
2011-03-09 18:36:04 +01:00
f3f391ddc0
lh_config: add jffs2 in supported filesystems
2011-03-09 18:36:03 +01:00
fa1d552b66
lh_source_debian: add mtd-tools since it provides mkfs.jffs2 application
2011-03-09 18:36:03 +01:00
9f6f1f3f84
chroot: don't fail if /dev/pts is already mounted
2011-03-09 18:36:02 +01:00
cd087b9abf
binary: do not fail if parameters.txt isn't available
2011-03-09 18:36:01 +01:00
a6da98c2b8
Fixing typo.
2011-03-09 18:36:00 +01:00
15cb7bb5c1
bootstrap: use minbase flavour when LH_PACKAGES_LISTS is set to minimal
...
Since debootstrap 1.0.8 there's a variant called minbase that installs
just essentials packages so base's size is greatly reduced. Use this
variant when producing reduced images.
2011-03-09 18:35:59 +01:00
ffa2568b55
bootstrap: adds support to debootstrap 1.0.7
...
New debootstrap has change the scripts to /usr/share since they're
architecture independent code. The support for it has been added
however it fallback to /usr/lib to keep backward compatibility.
2011-03-09 18:35:58 +01:00
bc23f61130
Removing unintendet set -x.
2011-03-09 18:35:57 +01:00
f224359bb1
Working arround aptitude behaviour of removing packages rather than to installing missing depends when using initramfs generator from local-packages.
2011-03-09 18:35:57 +01:00
68be48c28e
Correcting wrong installation attempt of initramfs generator from local-packages.
2011-03-09 18:35:56 +01:00
c87301732b
Installing initramfs generator from local-packages, if available.
2011-03-09 18:35:54 +01:00
74b2c5778d
Renaming mini flavour to stripped to avoid confusion, thanks to Fathi Boudra <fabo@debian.org> and Ben Armstrong <synrg@debian.org>.
2011-03-09 18:35:54 +01:00
58e7e813be
Fixing typo, thanks to Fathi Boudra <fabo@debian.org>.
2011-03-09 18:35:51 +01:00
324621f3f4
Checking for /sys/class rather than /sys/kernel, avoids problem when running under OpenVZ which doesn't have sys/kernel, thanks to Takeshi Yaegashi <yaegashi@debian.org>.
2011-03-09 18:35:48 +01:00
577d29afa8
Re-order hooks such that local hooks are executed first. ( Closes : #453360 )
...
Some non-local hooks clean the chroot too much, resulting in the
local hooks having to perform identical clean-up tasks (for example,
downloading a package).
2011-03-09 18:35:44 +01:00
e0ad886393
Re-add guards against bogus 'for' shell expansion.
2011-03-09 18:35:43 +01:00
2ebe770e41
Refactor d-i udeb handling with better failure mode ( Closes : #444565 )
2011-03-09 18:35:42 +01:00
cf3d97cd1f
Use Install_file for udebs.
2011-03-09 18:35:41 +01:00
342d2870eb
Consistently using the pipe as seperator in sed commands now.
2011-03-09 18:35:39 +01:00
042dfa1ee0
Move installing binary.deb/archives/*.deb.
2011-03-09 18:35:37 +01:00
28d856f6f1
Remove conditionals, as an expansion never 'fails': it just
...
won't copy any files.
2011-03-09 18:35:36 +01:00
295542614d
Refactor installing file to binary/pool/main/./.* functionality.
2011-03-09 18:35:35 +01:00
716d31d587
Don't put more than one glob on a 'for' line, unless they are guaranteed
...
to succeed, otherwise the second one is not expanded and "*.deb" (for
example) is used literally.
This patch expands (haha) each "for" loop into it's own.
2011-03-09 18:35:34 +01:00
6a9d30b2ae
Implement -v/--version and -h/--help in lh_clean.
2011-03-09 18:35:31 +01:00
94e44ce69a
Implement -u/--usage function in lh_clean ( Closes : #454553 )
2011-03-09 18:35:28 +01:00
d725d86274
Don't fail if resolv.conf is a symlink, thanks to David Madore <david.madore@ens.fr> ( Closes : #457595 ).
2011-03-09 18:22:29 +01:00
969ac8f07f
Switching to GPL3+.
2011-03-09 18:22:29 +01:00
3818b02197
Addjusting lh helper to be called from lh_local.
2011-03-09 18:22:29 +01:00
ac8753ea3f
Adding lh_local based on the idea from Tzafrir Cohen <tzafrir.cohen@xorcom.com>.
2011-03-09 18:22:29 +01:00
ff9af0f960
Fixed incomplete fdisk parameter list in lh_config --help.
2011-03-09 18:22:29 +01:00
de1698708d
Also removing manpage cache in cleanup.
2011-03-09 18:22:29 +01:00
e5ac7fb714
Disabling global arguments in lh_clean ( Closes : #451960 ).
2011-03-09 18:22:29 +01:00
76c75b83c5
Moving sanity check in lh_clean to the earliest possibility.
2011-03-09 18:22:29 +01:00
7ace089629
Switching lh_clean to proper command line arguments.
2011-03-09 18:22:29 +01:00
cbcb382f13
Fixing wrong parted call.
2011-03-09 18:22:29 +01:00
cd2618e5d5
Adding an upgrade and dist-upgrade to lh_chroot_sources, so that security updates gets pulled into the base system. Thanks to Kai Hendry <hendry@iki.fi>.
2011-03-09 18:22:29 +01:00
01d34e6d1d
Adding binary filesystem option, currently only supporting fat16 and fat32.
2011-03-09 18:22:29 +01:00
c59670779a
Speeding up the dd call, thanks to Peter Skogstroem <peter.skogstrom@bitrunner.com>.
2011-03-09 18:22:29 +01:00
c4ba9e6be8
Do really not create the filesystem with parted.
2011-03-09 18:22:29 +01:00
44a36ecc49
Do not create the filesystem with parted.
2011-03-09 18:22:29 +01:00
ec72b41c82
Mounting pseudo filesystems before creating binary images in non-chrooted builds.
2011-03-09 18:22:29 +01:00
c6236a0794
Moving lh_losetup into an internal function, avoiding helper failure with return value due to new trap.
2011-03-09 18:22:29 +01:00
b5dc203126
Fixing fstab handling.
2011-03-09 18:22:29 +01:00
de1e32df4c
Fixing some coding style issues.
2011-03-09 18:22:29 +01:00
1324f6e13b
Adding 'remove' case, which is in between of all and purge.
2011-03-09 18:22:29 +01:00
0c2e079c10
Outputting an own message when having more than one case in a helper, instead of a global one.
2011-03-09 18:22:29 +01:00
0e2e348b53
Fixed a few bashisms, thanks to Trent W. Buck <trentbuck@gmail.com>.
2011-03-09 18:22:29 +01:00
02a9e71667
Adding option to disable md5sum generation.
2011-03-09 18:22:29 +01:00
8321653cb3
Adding check to detect gnu-fdisk and using the original fdisk, thanks to Peter Skogström <peter.skogstrom@bitrunner.com> for the report.
2011-03-09 18:22:29 +01:00
b47d0c480d
Adding a check to see if user is running lh_clean from a sane location (i.e. not config/), thanks to Kai Hendry <hendry@webconverger.com>.
2011-03-09 18:22:29 +01:00
Daniel Baumann
Marco Amadori
Chris Lamb
Tiago Bortoletto Vaz
Tiago Bortoletto Vaz
Antonio Terceiro
Marco Amadori
Bas Wijnen
Otavio Salvador