Commit Graph

441 Commits

Author SHA1 Message Date
Chris Lamb 57029d7a66 Fix handling of --version and getopt program name. 2011-03-09 19:03:42 +01:00
Daniel Baumann 30b0d0a5f3 Simplyfing partition size check when enforcing fat32. 2011-03-09 19:03:41 +01:00
Daniel Baumann 107125bae8 Automatically enforcing fat32 on usb-hdd when detecting partitions bigger than 2GB. 2011-03-09 19:03:41 +01:00
Daniel Baumann 759d82a2c4 Automatically enforcing fat32 on usb-hdd when detecting files bigger than 2GB. 2011-03-09 19:03:41 +01:00
Daniel Baumann dbb7a3d459 Correcting wrong logic in lh_cleans check for beeing in the config directory or not (in order to prevent accidental cleaning by the user). 2011-03-09 19:03:41 +01:00
Daniel Baumann 1102bca971 Always using apt to install keyring packages (Closes: #498531). 2011-03-09 19:03:41 +01:00
Chris Lamb c0a28cb532 Add silo to sparc source package selection. 2011-03-09 19:03:41 +01:00
Chris Lamb 9c13ebdf48 Use tar to perform lh_bootstrap_copy (Closes: #498385) 2011-03-09 19:03:41 +01:00
Chris Lamb 8d373e005b Refactor partition size calculation, ensuring a uniform increase for ext partitions. 2011-03-09 19:03:41 +01:00
Chris Lamb cf20a5b7b7 Additionally unmount chroot/binary.tmp in lh_clean --chroot. 2011-03-09 19:03:41 +01:00
Chris Lamb a2c5c9e2d0 Unmount chroot/dev.tmp/pts filestems created by lh_binary_usb-hdd in lh_clean. 2011-03-09 19:03:41 +01:00
Chris Lamb 4908e9a907 Add "/.disk" metadata on usb-hdd images. 2011-03-09 19:03:41 +01:00
Chris Lamb 523899d26d Use cp's "-T" option instead of shell globbing to ensure dotfiles in the binary image's / are copied. 2011-03-09 19:03:41 +01:00
Chris Lamb 80bcf4d3b7 Standardise on appending " (fail-safe mode)" for all bootloaders. 2011-03-09 19:03:41 +01:00
Daniel Baumann 3c48eb2a5a Fixing a chicken-egg problem with package indices when using minimal/stripped list *and* including local-packages. 2011-03-09 19:03:40 +01:00
Chris Lamb 478a3ca3dd mksquashfs in Lenny supports -no-progress, so remove (broken) check. 2011-03-09 19:03:40 +01:00
Daniel Baumann 45a98f5977 Correcting chroot call to process config/binary_rootfs/excludes in chrooted builds. 2011-03-09 19:03:40 +01:00
Daniel Baumann 492c2876ac Replacing Chroot(); call for removing the udev persistent-net rules with a direct rm call to avoid beeing expanded by the shell based on the build systems files. 2011-03-09 19:03:40 +01:00
Daniel Baumann 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
Marco Amadori dbcc5dc8b3 Fixed 2 typos in getopt longoptions string. 2011-03-09 19:03:40 +01:00
Daniel Baumann 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
Daniel Baumann 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
Daniel Baumann 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
Daniel Baumann 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
Chris Lamb 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
Chris Lamb b6a9ccaa08 Remove pointless whitespace. 2011-03-09 19:03:40 +01:00
Chris Lamb 3ef5610890 Removing surrounded braces from LH_BOOTAPPEND_INSTALL - it is expanded by sed, not the shell. 2011-03-09 19:03:40 +01:00
Chris Lamb c4c0f319ae Correcting typo LH_BOOTSTRAP_INSTALL -> LH_BOOTAPPEND_INSTALL in Grub kernel parameters. 2011-03-09 19:03:40 +01:00
Chris Lamb 6018c34eda Correct bogus path for d-i preseed files. 2011-03-09 19:03:40 +01:00
Chris Lamb 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
Daniel Baumann b070f0a9a3 Preserve changed apt settings (pdiffs, recommends, and secure) in binary image (Closes: #494640). 2011-03-09 19:03:40 +01:00
Chris Lamb 1a8e869265 Remove accidental trailing '"' (quote) package from lh_config usage. 2011-03-09 19:03:39 +01:00
Daniel Baumann 8888135805 Updating chroot hacks to reflect namechange of the udev persistent rules. 2011-03-09 19:03:39 +01:00
Daniel Baumann 7e20d93cf5 Correcting typo in win32-loader config. 2011-03-09 19:03:39 +01:00
Tiago Bortoletto Vaz 5b882c2b34 Making lh_chroot_interactive and lh_source_usb-hdd messages translatable. 2011-03-09 19:03:39 +01:00
Tiago Bortoletto Vaz 049d0abfca Making lh_binary_usb-hdd messages translatable. 2011-03-09 19:03:39 +01:00
Daniel Baumann 3e3bb42607 Moving win32-loader inclusion support from external hook into main program (Closes: #476546). 2011-03-09 19:03:39 +01:00
Daniel Baumann 2bec7369f1 Removing currently unused help message in lh_config. 2011-03-09 19:03:39 +01:00
Chris Lamb afc3dc8166 Tidy "install" / "install-binary" handling in lh_chroot_apt. 2011-03-09 19:03:39 +01:00
Chris Lamb 3732c2c4bb Add informational comments to generated /etc/apt/preferences stanzas. 2011-03-09 19:03:39 +01:00
Chris Lamb 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
Chris Lamb 445de4d80a Prevent (harmless) duplicate entries appearing in /etc/apt/preferences 2011-03-09 19:03:39 +01:00
Tiago Bortoletto Vaz aa6204c8ae Also allowing multiple preseeding files for netboot. 2011-03-09 19:03:39 +01:00
Daniel Baumann 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
Tiago Bortoletto Vaz eae542daba Allowing to use more than one preseeding file to be on the media. 2011-03-09 19:03:39 +01:00
Chris Lamb 36929d2172 Ensure the binary image does not inherit the binary stage's APT settings. 2011-03-09 19:03:39 +01:00
Chris Lamb 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
Chris Lamb 765b7bb72d Correct indentation of conditional code. 2011-03-09 19:03:38 +01:00
Chris Lamb ddc31653d7 Clean source.list instead of binary.list when calling lh_clean --source. 2011-03-09 19:03:38 +01:00
Tiago Bortoletto Vaz 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
Chris Lamb c7bccbbf26 Add busybox to DI_PACKAGES as its required to install kernels. 2011-03-09 19:03:38 +01:00
Chris Lamb aa9c076df9 Choose correct d-i install method for "live" and usb-hdd/tar image types. 2011-03-09 19:03:38 +01:00
Chris Lamb 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
Chris Lamb 4dc5c74e05 Create pool/main to prevent build failure when no local .debs are queued for installation. 2011-03-09 19:03:38 +01:00
Chris Lamb a1c4763a02 Don't include the bootstrap .debs on live-installer based disks (saves ~30MiB). 2011-03-09 19:03:38 +01:00
Chris Lamb d6053a8103 Rework WGET_OPTIONS and use "--no-verbose" by default (just prints the URL). 2011-03-09 19:03:38 +01:00
Chris Lamb 1edb9bd7c8 Fix "lh_config -c". Thanks to Simon Schiele <lists@codingmonkey.de>. 2011-03-09 19:03:38 +01:00
Chris Lamb 7bd69bd567 Remove --debian-installer-daily from getopt call. 2011-03-09 19:03:38 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Daniel Baumann ba25e433b5 Merging debian-installer-daily option into debian-installer-distribution. 2011-03-09 19:03:38 +01:00
Tiago Bortoletto Vaz 17ca582c93 Minor typo fix for encryption parameter in lh_config help message. 2011-03-09 19:03:38 +01:00
Tiago Bortoletto Vaz 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
Tiago Bortoletto Vaz 36f8ceb644 Adding missing debian-installer options in lh_config --help message. 2011-03-09 19:03:37 +01:00
Antonio Terceiro 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
Chris Lamb 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
Chris Lamb 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
Chris Lamb 6538fac66f Test whether to use hard-links when caching d-i downloads. 2011-03-09 19:03:37 +01:00
Chris Lamb 38a545b3d1 Don't install Recommends of d-i packages. 2011-03-09 19:03:37 +01:00
Chris Lamb 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
Chris Lamb bd4a6204bb Print nicer error message when bootstrap missing from LH_CACHE_STAGES. 2011-03-09 19:03:37 +01:00
Chris Lamb 2da3bcef16 Remove 'E:' prefix in call to Echo_error - it gets added later too. 2011-03-09 19:03:37 +01:00
Daniel Baumann b13a8381a4 Only using hardlinks for local-packages when hardlinks are possible. 2011-03-09 19:03:37 +01:00
Daniel Baumann b4c24e4136 Removing make-live legacy helper. 2011-03-09 19:03:37 +01:00
Daniel Baumann 698992351c Making check for local-patches silent. 2011-03-09 19:03:37 +01:00
Daniel Baumann 4b7b96bce8 Making check for local-includes silent. 2011-03-09 19:03:37 +01:00
Tiago Bortoletto Vaz 8eb8c921d6 Improving message when using default values in /etc/default/live-helper. 2011-03-09 19:03:37 +01:00
Chris Lamb d58eaafd5a Add lh_chroot_local-patches helper to apply local patches against chroot. 2011-03-09 19:03:37 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 2a2668aef9 Cache d-i kernel, initrd and mini.iso downloads (Closes: #492085) 2011-03-09 19:03:37 +01:00
Chris Lamb 877603ae02 Wrap most calls to wget in lh_binary_debian-installer. 2011-03-09 19:03:37 +01:00
Daniel Baumann 4ca717c428 Using rfc2606 invalid tld instead of dummy. 2011-03-09 19:03:37 +01:00
Daniel Baumann 8b2ee102d2 Using better suited variable name for live-helpers local key. 2011-03-09 19:03:37 +01:00
Chris Lamb a74d37bdc0 Additionally clean md5sum.txt temporary file. 2011-03-09 19:03:37 +01:00
Chris Lamb a00b0987a9 Remove pointless whitespace. 2011-03-09 19:03:37 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Chris Lamb dd074f1461 Abort build if working directory contains spaces - not supported by (at least) debootstrap and cdebootstrap. 2011-03-09 19:03:36 +01:00
Chris Lamb 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
Chris Lamb b6e8bde6d5 Fix syntax error in --ignore-system-defaults handling. 2011-03-09 19:03:36 +01:00
Chris Lamb 0e0c22cb6f Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9) 2011-03-09 19:03:36 +01:00
Chris Lamb 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
Chris Lamb 6e64be0c82 Fix formatting error with --ignore-system-defaults in "lh_config --help" 2011-03-09 19:03:36 +01:00
Chris Lamb c907da2ad1 Add --ignore-system-defaults option to not source /etc/default/live-helper. 2011-03-09 19:03:36 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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