069aa8723c
Splitting out win32-loader handling into own helper script.
2011-03-09 19:09:41 +01:00
26314ad6a0
Adding clean parameter to lh_config to minimize config directory by automatically removing unused and thus empty subdirectories.
2011-03-09 19:09:41 +01:00
4d3525ab0f
Correcting order of genisoimage option assembling, the exludes do have to be processed last.
2011-03-09 19:09:41 +01:00
285b6ed834
Adding autoconfig support to lh_build as well.
2011-03-09 19:09:41 +01:00
695cdf1530
Fixing infinit loop when using autoconfig for lh_config and lh_clean.
2011-03-09 19:09:41 +01:00
2e9433d58d
Removing shell specific extensions and call of scripts/config and scripts/clean, thanks to Tzafrir Cohen <tzafrir.cohen@xorcom.com>.
2011-03-09 19:09:41 +01:00
0c9e2bf57c
Adding dummy live-helper command to make any confused user aware that live-helper is a set of commands starting with the lh_ prefix.
2011-03-09 19:09:40 +01:00
730b248507
Replacing previous attempt of using config.cfg, now using scripts/config.sh and scripts/clean.sh instead.
2011-03-09 19:09:40 +01:00
992a145afd
Automatically displaying manpage when calling a helper with -h or --help.
2011-03-09 19:09:40 +01:00
dd74cb6b47
Correcting lh_configs config.cfg handling, so that it's at least working when not using config.cfg. Will have to be fixed properly later.
2011-03-09 19:09:40 +01:00
989f26d87b
Updating year in copyright notices for 2009.
2011-03-09 19:09:40 +01:00
9ce762a502
Using common function file to source shell includes.
2011-03-09 19:09:40 +01:00
58d6b235f9
Fixing and unifying handling of hooks.
2011-03-09 19:09:40 +01:00
67a0daf671
Removing enforced installation of mawk in the chroot in lh_binary_debian-installer, mawk is priority required and therefore always there anyway. Additionally, this would unnecessarily blow up images that have gawk (or any other awk implementation) installed.
2011-03-09 19:09:40 +01:00
951c24dc08
Adding temporary workaround to 'failed to install grub' error when using live-installer.
2011-03-09 19:09:40 +01:00
a0d12dbf00
Actually doing apt-ftparchive operations in chroot as it was originally intended to be, otherwise apt-utils would be need to be a depends of live-helper.
2011-03-09 19:09:40 +01:00
6193ef2285
Actually fix initrd-related breakage in chroot hacks.
...
To actually handle the case where there are no initrds, one has to tell
xargs not to run the chmod command if there are no parameters.
2011-03-09 19:09:40 +01:00
4652d65411
Make hacks not break if there are no initrds.
...
Even if it's likely that initrds will be present at this stage, it might
be that they went away because of local hooks, and hacks shouldn't break
just because of missing initrds.
2011-03-09 19:09:40 +01:00
f5cb9b046b
Fix --apt-pdiffs disabled being ignored.
2011-03-09 19:09:40 +01:00
b12e0fd6ce
Document LH_BOOTSTRAP_FLAVOUR as empty by default.
2011-03-09 19:09:40 +01:00
5d9525a3b0
Adding missing --dump to help output of lh_config.
2011-03-09 19:09:40 +01:00
cb2397a601
Updating mode help message in lh_config.
2011-03-09 19:09:40 +01:00
84e4a199da
Setting default taskel program from aptitude to tasksel.
2011-03-09 19:09:40 +01:00
451d36016c
Adding support for using cdebootstra-static as bootstrap program.
2011-03-09 19:09:40 +01:00
e51e734b00
If config.cfg is executable, we execute it and accept its output as extra arguments. This makes dynamic configuration possible.
2011-03-09 19:09:40 +01:00
304e0fce7f
Fixing message for i18n compatibiliy
2011-03-09 19:09:40 +01:00
67518ecdab
Parsing lh_config flags from config.cfg, if available.
2011-03-09 19:09:40 +01:00
8a477ac3a9
Translating the description of the helpers
2011-03-09 19:09:39 +01:00
d974407ee5
Don't ask for translators to translate a bunch of asterisks
2011-03-09 19:09:39 +01:00
2a3056e8a9
Don't break messages into parts; this make it impossible for translators
2011-03-09 19:09:39 +01:00
4185bfed45
Moving removal of apt packages lists from minimal and stripped hook to lh_chroot_sources, thanks to Ben Armstrong <synrg@debian.org>.
2011-03-09 19:09:39 +01:00
425d51e38b
Prefering local hosts over truncated one.
2011-03-09 19:09:39 +01:00
a7334c6c16
Prefering local resolv.conf over truncated one.
2011-03-09 19:09:39 +01:00
4f00cd3e82
Truncating resolv.conf created during bootstrap stage, otherwise we'll end up with a local resolv.conf in the final image. Thanks to Ben Armstrong <synrg@debian.org>.
2011-03-09 19:09:39 +01:00
c83edb9134
Also handling custom apt.conf in config/chroot_apt/apt.conf to allow further apt configuration ( Closes : #511247 ).
2011-03-09 19:09:35 +01:00
b211776641
Re-order arguments to find(1) to silence warning about sub-optimal ordering.
2011-03-09 19:09:34 +01:00
d8e5221399
Don't assume that if dpkg is installed, we'll actually get a live-helper version number from it.
2011-03-09 19:09:33 +01:00
fc578d6ae6
Test for dpkg-query instead of dpkg if we are only going to run dpkg-query within that scope.
2011-03-09 19:09:32 +01:00
146cbe3671
Only print versions of live-helper in --dump output, not every package installed.
2011-03-09 19:09:30 +01:00
d9b7957ff4
Add 'dump' as a getopt longoption so as not to prevent rejection of --dump argument to lh_config.
2011-03-09 19:09:29 +01:00
a796685a27
NEW: "binary_debian-installer-includes" config directory.
...
This add another "-includes" power to live-helper, just leave your full
path files there and they will end on the installer initrd. This is
mostly useful for hacking the installer images with themes, firmware and
new installation helpers.
"This doesn't handle the case where you want to remove files or
programmatically modify things" yet.
2011-03-09 19:03:45 +01:00
34192bcf31
Don't attempt to remove scripts directory in lh_clean if it doesn't exist.
2011-03-09 19:03:45 +01:00
5e7f545474
Even though users are supposed to have any local-includes with the correct owner and permissions, we set them manually on /home/user as it's likely that anybody will forget it ( Closes : #506553 ).
2011-03-09 19:03:45 +01:00
c4c64bc0f8
Removing scripts directory through lh_clean, if it's not empty.
2011-03-09 19:03:45 +01:00
5166362009
Copy menu binary from the correct directory
2011-03-09 19:03:45 +01:00
55254a01fd
Applied patch from Maximilian Gass <mxey@cloudconnected.org> to fix typo in generation of release files in lh_chroot_sources.
2011-03-09 19:03:44 +01:00
2e61cf50af
ignore harmless warnings from parted.
2011-03-09 19:03:44 +01:00
22a06c6566
Generalizing internal LH_CONFFILE variable.
2011-03-09 19:03:44 +01:00
b55f1963c8
Correcting manpage section reference in a comment in lh.
2011-03-09 19:03:44 +01:00
8ff4391fd7
Cleaning up code of 'lh' short helper.
2011-03-09 19:03:44 +01:00
c225229f29
Implementing colorful output (currently disabled by default, though).
2011-03-09 19:03:44 +01:00
776a7b2227
Generalizing internal LH_BREAKPOINTS variable.
2011-03-09 19:03:44 +01:00
ad6b01b388
Generalizing internal LH_VERBOSE variable.
2011-03-09 19:03:44 +01:00
cb0894b3b3
Generalizing internal LH_QUIET variable.
2011-03-09 19:03:43 +01:00
3ff1c8050b
Generalizing internal LH_DEBUG variable.
2011-03-09 19:03:43 +01:00
137f573c85
Generalizing internal LH_FORCE variable.
2011-03-09 19:03:43 +01:00
141b4f7e0f
Slightely improving wording of the 'bootloader not yet supported' when creating images.
2011-03-09 19:03:43 +01:00
3a2d87b74b
Slightly reordering genisoimage option assembling.
2011-03-09 19:03:43 +01:00
0eaf9e5122
Adding armel to architecture specific checks.
2011-03-09 19:03:43 +01:00
1c1e7db6c4
Generalizing internal Chroot(); by requiring its first argument to be the chroot directory.
2011-03-09 19:03:43 +01:00
6696b019fe
Renaming internal Read_conffile(); to Read_conffiles(); for consistency reasons.
2011-03-09 19:03:43 +01:00
c36bae1013
Updating releases.sh to match internal namespace of included functions.
2011-03-09 19:03:43 +01:00
ef8a1b4ca9
Improving version output of lh_config --dump.
2011-03-09 19:03:43 +01:00
d33dce984d
Using dd rather than cat to write mbr.bin to usb-hdd images; dd is more robust in case mbr.bin is corrupted.
2011-03-09 19:03:43 +01:00
6f9a33bf9f
Merging lh_dumpconfig into lh_config as --dump parameter.
2011-03-09 19:03:43 +01:00
9af11084af
Adjusting code style of lh_dumpconfig.
2011-03-09 19:03:43 +01:00
660bd98473
Add lh_dumpconfig helper to print suitable output for pastebins and other remote debugging.
2011-03-09 19:03:43 +01:00
4dc5ffe7f3
Ensure lh_binary_debian-installer includes local debs ( Closes : #502877 )
...
* fixed some path references to the "config" directory.
2011-03-09 19:03:43 +01:00
cf53392616
Setup cleanup hook in the high-level helpers.
2011-03-09 19:03:43 +01:00
6204dc0e6d
Enforcing lh_config to be run before lh_build, see also http://lists.debian.org/debian-live/2008/10/msg00102.html ( Closes : #500740 ).
2011-03-09 19:03:42 +01:00
0cbbde2b96
Using simplified Require_stagefile(); calls by passing multiple arguments.
2011-03-09 19:03:42 +01:00
d92d4e2201
For consistency, don't preserve uid/gid for files in binary_local-includes.
2011-03-09 19:03:42 +01:00
d9810a3644
Ensure all files installed via chroot_local-includes are owned by root:root. Thanks to Julien Cristau <jcristau@debian.org>.
...
This may cause problems for users who are relying on the target uid and gid
of the files in the build system's config/chroot_local-includes being the
same on the live image.
2011-03-09 19:03:42 +01:00
2722cbb709
Making sure /etc/sudoers has right owner/permissions.
2011-03-09 19:03:42 +01:00
61ffd3e944
Manually setting owner of /etc/skel to root.
2011-03-09 19:03:42 +01:00
c977712868
Making removal stage of lh_chroot_selinuxfs dependent on the existence of /selinux, otherwise that directory would be always created in the chroot.
2011-03-09 19:03:42 +01:00
7ce22c258d
Applying patch from Frederic Boiteux <fboiteux@calistel.com> to support wildcards in rootfs exclude lists ( Closes : #500677 ).
2011-03-09 19:03:42 +01:00
1476f3a1c3
Adding lh_chroot_selinuxfs helper to support building live images on a selinux enabled host ( Closes : #501652 ).
2011-03-09 19:03:42 +01:00
63dc9da964
lh_config --help and manpage 'copy' mention.
2011-03-09 19:03:42 +01:00
817f3f8cf6
Improving indices workaround by checking LH_BOOTSTRAP_FLAVOUR rather than LH_PACKAGES_LISTS in order to handle chicken-egg problem for installing apt-utils when having bootstrapped a minimal chroot.
2011-03-09 19:03:42 +01:00
15a8c9ab3d
Include source for sparc-utils on that architecture.
2011-03-09 19:03:42 +01:00
13804c6102
Correcting sparc architecture detection to ensure correct source package contents.
2011-03-09 19:03:42 +01:00
bb97c59eb7
Install appropriate tasksel program.
2011-03-09 19:03:42 +01:00
7bc94cef99
Don't build up source package list inside chroot.
2011-03-09 19:03:42 +01:00
ab1e4ce5a8
Create a "missing-source.txt" file containing missing source packages instead of exiting.
2011-03-09 19:03:42 +01:00
0c8232307d
Only install memtest in lh_binary_syslinux if enabled.
2011-03-09 19:03:42 +01:00
44fefdf1d3
Additionally save the 'scripts/' subdirectory if it contains files when building source images.
2011-03-09 19:03:42 +01:00
8d9860284d
Fix timing issue in create of source tarballs. Patch by Sebastian H <shbugreport@online.de>. ( Closes : #499793 )
2011-03-09 19:03:42 +01:00
ed6d9e8c8c
Adding explicit --yes to apt-get call when installing keyring packages (previously, this was inherited through Apt(); wrapper) ( Closes : #499625 ).
2011-03-09 19:03:42 +01:00
4210fbf03c
Really fix LH_BOOTSTRAP="copy". Thanks to Andreas Teuchert <ant+bdo@hsg-kl.de>. ( Closes : #498385 )
2011-03-09 19:03:42 +01:00
dfc00ce30c
Splitted "longoptions" in various lines.
2011-03-09 19:03:42 +01:00
f423bca5d8
Adding scripts directory to to include custom helper scripts.
2011-03-09 19:03:42 +01:00
57029d7a66
Fix handling of --version and getopt program name.
2011-03-09 19:03:42 +01:00
30b0d0a5f3
Simplyfing partition size check when enforcing fat32.
2011-03-09 19:03:41 +01:00
107125bae8
Automatically enforcing fat32 on usb-hdd when detecting partitions bigger than 2GB.
2011-03-09 19:03:41 +01:00
759d82a2c4
Automatically enforcing fat32 on usb-hdd when detecting files bigger than 2GB.
2011-03-09 19:03:41 +01:00
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
1102bca971
Always using apt to install keyring packages ( Closes : #498531 ).
2011-03-09 19:03:41 +01:00
c0a28cb532
Add silo to sparc source package selection.
2011-03-09 19:03:41 +01:00
9c13ebdf48
Use tar to perform lh_bootstrap_copy ( Closes : #498385 )
2011-03-09 19:03:41 +01:00
8d373e005b
Refactor partition size calculation, ensuring a uniform increase for ext partitions.
2011-03-09 19:03:41 +01:00
cf20a5b7b7
Additionally unmount chroot/binary.tmp in lh_clean --chroot.
2011-03-09 19:03:41 +01:00
a2c5c9e2d0
Unmount chroot/dev.tmp/pts filestems created by lh_binary_usb-hdd in lh_clean.
2011-03-09 19:03:41 +01:00
4908e9a907
Add "/.disk" metadata on usb-hdd images.
2011-03-09 19:03:41 +01:00
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
80bcf4d3b7
Standardise on appending " (fail-safe mode)" for all bootloaders.
2011-03-09 19:03:41 +01:00
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
478a3ca3dd
mksquashfs in Lenny supports -no-progress, so remove (broken) check.
2011-03-09 19:03:40 +01:00
45a98f5977
Correcting chroot call to process config/binary_rootfs/excludes in chrooted builds.
2011-03-09 19:03:40 +01:00
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
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
Daniel Baumann
Cyril Brulebois
Antonio Terceiro
Chris Lamb
Marco Amadori
An-Cheng Huang
Marco Amadori
Maximilian Gass
Chris Lamb
Tiago Bortoletto Vaz