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
Daniel Baumann
68be48c28e
Correcting wrong installation attempt of initramfs generator from local-packages.
2011-03-09 18:35:56 +01:00
Daniel Baumann
c87301732b
Installing initramfs generator from local-packages, if available.
2011-03-09 18:35:54 +01:00
Daniel Baumann
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
Daniel Baumann
58e7e813be
Fixing typo, thanks to Fathi Boudra <fabo@debian.org>.
2011-03-09 18:35:51 +01:00
Daniel Baumann
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
Chris Lamb
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
Chris Lamb
e0ad886393
Re-add guards against bogus 'for' shell expansion.
2011-03-09 18:35:43 +01:00
Chris Lamb
2ebe770e41
Refactor d-i udeb handling with better failure mode ( Closes : #444565 )
2011-03-09 18:35:42 +01:00
Chris Lamb
cf3d97cd1f
Use Install_file for udebs.
2011-03-09 18:35:41 +01:00
Daniel Baumann
342d2870eb
Consistently using the pipe as seperator in sed commands now.
2011-03-09 18:35:39 +01:00
Chris Lamb
042dfa1ee0
Move installing binary.deb/archives/*.deb.
2011-03-09 18:35:37 +01:00
Chris Lamb
28d856f6f1
Remove conditionals, as an expansion never 'fails': it just
...
won't copy any files.
2011-03-09 18:35:36 +01:00
Chris Lamb
295542614d
Refactor installing file to binary/pool/main/./.* functionality.
2011-03-09 18:35:35 +01:00
Chris Lamb
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
Chris Lamb
6a9d30b2ae
Implement -v/--version and -h/--help in lh_clean.
2011-03-09 18:35:31 +01:00
Chris Lamb
94e44ce69a
Implement -u/--usage function in lh_clean ( Closes : #454553 )
2011-03-09 18:35:28 +01:00
Daniel Baumann
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
Daniel Baumann
969ac8f07f
Switching to GPL3+.
2011-03-09 18:22:29 +01:00
Daniel Baumann
3818b02197
Addjusting lh helper to be called from lh_local.
2011-03-09 18:22:29 +01:00
Daniel Baumann
ac8753ea3f
Adding lh_local based on the idea from Tzafrir Cohen <tzafrir.cohen@xorcom.com>.
2011-03-09 18:22:29 +01:00
Daniel Baumann
ff9af0f960
Fixed incomplete fdisk parameter list in lh_config --help.
2011-03-09 18:22:29 +01:00
Daniel Baumann
de1698708d
Also removing manpage cache in cleanup.
2011-03-09 18:22:29 +01:00
Daniel Baumann
e5ac7fb714
Disabling global arguments in lh_clean ( Closes : #451960 ).
2011-03-09 18:22:29 +01:00
Daniel Baumann
76c75b83c5
Moving sanity check in lh_clean to the earliest possibility.
2011-03-09 18:22:29 +01:00
Daniel Baumann
7ace089629
Switching lh_clean to proper command line arguments.
2011-03-09 18:22:29 +01:00
Daniel Baumann
cbcb382f13
Fixing wrong parted call.
2011-03-09 18:22:29 +01:00
Daniel Baumann
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
Daniel Baumann
01d34e6d1d
Adding binary filesystem option, currently only supporting fat16 and fat32.
2011-03-09 18:22:29 +01:00
Daniel Baumann
c59670779a
Speeding up the dd call, thanks to Peter Skogstroem <peter.skogstrom@bitrunner.com>.
2011-03-09 18:22:29 +01:00
Daniel Baumann
c4ba9e6be8
Do really not create the filesystem with parted.
2011-03-09 18:22:29 +01:00
Daniel Baumann
44a36ecc49
Do not create the filesystem with parted.
2011-03-09 18:22:29 +01:00
Daniel Baumann
ec72b41c82
Mounting pseudo filesystems before creating binary images in non-chrooted builds.
2011-03-09 18:22:29 +01:00
Daniel Baumann
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
Daniel Baumann
b5dc203126
Fixing fstab handling.
2011-03-09 18:22:29 +01:00
Daniel Baumann
de1e32df4c
Fixing some coding style issues.
2011-03-09 18:22:29 +01:00
Daniel Baumann
1324f6e13b
Adding 'remove' case, which is in between of all and purge.
2011-03-09 18:22:29 +01:00
Daniel Baumann
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