Commit Graph

314 Commits

Author SHA1 Message Date
Chris Lamb 1acc8f8b0b Add lh_binary_silo and associated templates to support the SILO bootloader. 2011-03-09 19:03:35 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb e7b3cabbd7 Fix d-i locations in yaboot entries. 2011-03-09 19:03:35 +01:00
Chris Lamb 7b881914d4 Fix trivial typographic error ("flavor" => "flavour") 2011-03-09 19:03:35 +01:00
Chris Lamb 21592c73bc Only deference symlinks on FAT{16,32} partitions on usb-hdd. 2011-03-09 19:03:35 +01:00
Chris Lamb f662127928 Revert always deferencing symlinks when installing some binary includes. 2011-03-09 19:03:35 +01:00
Chris Lamb 600d183d29 Add Echo_breakage for messages preceeding often-breaking stages and use before {c,}debootstrap calls 2011-03-09 19:03:35 +01:00
Chris Lamb 243ee8a6d3 Replace a few unweildy "if" statements with their "case" equivalents 2011-03-09 19:03:35 +01:00
Chris Lamb 85493ae3b2 Move Etch syslinux workaround closer to the original definitions 2011-03-09 19:03:35 +01:00
Chris Lamb 1bd10cea37 Use correct location of powerpc d-i images. 2011-03-09 19:03:35 +01:00
Chris Lamb 4d748e582c Set correct d-i image type on usb-hdd and tar image types 2011-03-09 19:03:35 +01:00
Chris Lamb 4950924195 Remove pointless "echo" statements pre- and post- cdebootstrap 2011-03-09 19:03:35 +01:00
Chris Lamb 991139e0f6 Allow LH_APT_SECURE to disable package cdebootstrap package authentication 2011-03-09 19:03:34 +01:00
Chris Lamb 25ad66e62d Rename USE_NETBOOT_DI to DI_IMAGE_TYPE 2011-03-09 19:03:34 +01:00
Chris Lamb a1caf63a92 Always deference symlinks when installing some binary includes to fix breakage on amd64. 2011-03-09 19:03:34 +01:00
Chris Lamb 41638d7921 Ensure "Using system defaults" message appears when calling lh_config without --verbose 2011-03-09 19:03:34 +01:00
Chris Lamb 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
Chris Lamb 7540b66682 Don't exclude live-installer when LH_DEBIAN_INSTALLER=live 2011-03-09 19:03:34 +01:00
Chris Lamb 90d2fedc09 Fix a few bogus guards in lh_binary_debian-installer 2011-03-09 19:03:34 +01:00
Daniel Baumann e6b633314e Parsing local arguments to lh_config last. 2011-03-09 19:03:34 +01:00
Daniel Baumann 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
Daniel Baumann 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
Daniel Baumann 11883b9f46 Correcting path for system-wide lh_config defaults file. 2011-03-09 19:03:34 +01:00
Marco Amadori 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
Marco Amadori 2b287d6b6c Removed a useless space. 2011-03-09 19:03:34 +01:00
Chris Lamb b067d159ec Create chroot_local-preseed/ directory when building config/ in lh_config 2011-03-09 19:03:34 +01:00
Daniel Baumann ae58d0f7af Producing rsyncable tarballs where possible. 2011-03-09 19:03:33 +01:00
Chris Lamb 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
Chris Lamb efa7c76589 Remove temporary binary package list files 2011-03-09 19:03:32 +01:00
Chris Lamb ffa20df082 Tidy calls to new Expand_packagelist 2011-03-09 19:03:32 +01:00
Daniel Baumann 002c79ef51 Some formating and style cleanups. 2011-03-09 19:03:32 +01:00
Daniel Baumann cc3c1ff10d Using one single packages cache directory for all chroot packages. 2011-03-09 19:03:32 +01:00
Daniel Baumann 7bcdcf7f05 Using hardlinks to copy local packages into chroot. 2011-03-09 19:03:32 +01:00
Daniel Baumann d23cf256e8 Moving lh_chroot_packages call in lh_chroot to old place. 2011-03-09 19:03:32 +01:00
Chris Lamb 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
Chris Lamb 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
Tiago Bortoletto Vaz 001bb75189 lh_chroot_local-preseed: fix minor typo 2011-03-09 19:03:32 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Chris Lamb b0a4988bb7 Fix typo in policy-rc.d 2011-03-09 19:03:32 +01:00
Daniel Baumann 5fe14264e0 Sorting image file lists. 2011-03-09 19:03:32 +01:00
Daniel Baumann ef1b163040 Creating binary and source file lists in build directory. 2011-03-09 19:03:32 +01:00
Daniel Baumann e296deef49 Also copying binary package list to build directory. 2011-03-09 19:03:32 +01:00
Daniel Baumann 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
Chris Lamb 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
Chris Lamb 50e21abdb5 helpers/lh_config, functions/defaults.sh: Correct "boostrap" -> "bootstrap" 2011-03-09 19:03:32 +01:00
Daniel Baumann c37435dcc5 Sort md5sum.txt files again after filename. 2011-03-09 19:03:32 +01:00
Daniel Baumann ce7388dc68 Updating help output of lh_config. 2011-03-09 19:03:32 +01:00
Daniel Baumann 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
Daniel Baumann 26fc30d8eb Using new Read_conffile(); now. 2011-03-09 19:03:31 +01:00
Daniel Baumann c6b83b1fd3 Adding 'all' configuration file. 2011-03-09 19:03:31 +01:00
Daniel Baumann 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
Chris Lamb 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
Chris Lamb 55472e6557 Allow LH_ENCRYPTION="disabled" to disable encryption 2011-03-09 19:03:29 +01:00
Chris Lamb 13625df75c lh_binary_encryption: Rework and fix broken AES encryption routines 2011-03-09 19:03:28 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Chris Lamb 07c3a04027 lh_binary_debian-installer: Remove "local"-oriented bashisms 2011-03-09 19:03:23 +01:00
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Chris Lamb 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
Daniel Baumann 7c99543227 Correcting wrong logic on handling secure apt. 2011-03-09 19:01:50 +01:00
Daniel Baumann bacd270f71 Fixing wrong debian-installer auto target configuration. 2011-03-09 19:01:47 +01:00
Daniel Baumann 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
Chris Lamb df8e958021 Don't append 'quiet' kernel parameter in rescue modes 2011-03-09 19:01:44 +01:00
Chris Lamb 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
Daniel Baumann c5a91189a0 Updating copyright years to 2008. 2011-03-09 19:01:41 +01:00
Daniel Baumann 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
Bas Wijnen 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
Chris Lamb 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
Daniel Baumann f23072923e Adding temporary hack to remove fstab when using live-installer. 2011-03-09 18:36:19 +01:00
Daniel Baumann 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
Daniel Baumann 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
Daniel Baumann 979c71fd6e Including default kernel-img.conf in live-systems. 2011-03-09 18:36:18 +01:00
Daniel Baumann 2b086405f9 Using wildcards to support more than one preseeding file. 2011-03-09 18:36:17 +01:00
Daniel Baumann d78a97a521 Honor local preseeding file for debian-installer. 2011-03-09 18:36:17 +01:00
Daniel Baumann a74fb24d5e Fixing typo in sed call to set isolinux splash file. 2011-03-09 18:36:16 +01:00
Daniel Baumann 2b6c057b1c Added forgotten getopts arguments for chroot mirror. 2011-03-09 18:36:15 +01:00
Daniel Baumann 3c0d008c79 When a wrong argument is passed, that argument should be listed (Closes: #468201). 2011-03-09 18:36:14 +01:00
Daniel Baumann 0c9fc8846d Adding option to set binary-net compression (or disable it). 2011-03-09 18:36:13 +01:00
Daniel Baumann 5ce2688675 Re-adding additional indices updated, otherwise we wouldn't honor thirdparty repositories (anymore). 2011-03-09 18:36:09 +01:00
Daniel Baumann 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
Daniel Baumann 953a3d1af6 Renaming extra bootstrap indices to chroot. 2011-03-09 18:36:06 +01:00
Daniel Baumann 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
Otavio Salvador 1ffce292fb lh_binary_rootfs: add support to generate jffs2 filesystem 2011-03-09 18:36:05 +01:00
Otavio Salvador 5d3c850ccb lh_binary_encryption: add jffs2 as not supported filesystem 2011-03-09 18:36:04 +01:00
Otavio Salvador f3f391ddc0 lh_config: add jffs2 in supported filesystems 2011-03-09 18:36:03 +01:00
Otavio Salvador fa1d552b66 lh_source_debian: add mtd-tools since it provides mkfs.jffs2 application 2011-03-09 18:36:03 +01:00
Otavio Salvador 9f6f1f3f84 chroot: don't fail if /dev/pts is already mounted 2011-03-09 18:36:02 +01:00
Otavio Salvador cd087b9abf binary: do not fail if parameters.txt isn't available 2011-03-09 18:36:01 +01:00
Daniel Baumann a6da98c2b8 Fixing typo. 2011-03-09 18:36:00 +01:00
Otavio Salvador 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
Otavio Salvador 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
Daniel Baumann bc23f61130 Removing unintendet set -x. 2011-03-09 18:35:57 +01:00
Daniel Baumann 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