Commit Graph

343 Commits

Author SHA1 Message Date
Colin Watson 3a75594b8c Print the current time before starting a command with the lb wrapper script (Closes: #630089). 2012-01-12 22:22:57 +01:00
Daniel Baumann dce7b385ba Using syslinux payload as fallback in lb_binary_syslinux if no destinct image type could be deduced (Closes: #655562). 2012-01-12 12:34:53 +01:00
Daniel Baumann 2eab8fec68 Correcting wrong and incompatible loop for casper initrds in binary_disk. 2012-01-12 11:57:45 +01:00
Matthijs Kooijman 93a18b9cad Unmount chroot/root/config when running lb_clean. 2012-01-10 21:54:58 +01:00
Matthijs Kooijman 58209e8bd8 Use a two-stage mount again for mounting config inside chroot in lb_chroot_hooks.
This reverts part of cacf9b6e34 (but also adds a "bind" option to the
remount command, as documented in mount(8)).

Apparently, doing "mount -o bind,ro" doesn't work. It outputs:

	mount: warning: chroot/root/config seems to be mounted read-write.

and mounts read-write instead of read-only. This behaviour is
documented in mount(8). Newer kernels do seem to allow
combining bind with the read-only option (see mount(2)), but this does
not seem to work (possibly because mount is trying to be smart).
2012-01-10 21:54:58 +01:00
Matthijs Kooijman e7ecf56be3 Make the config available to all hooks.
Previously, the config was bindmounted inside the chroot only for hooks
from the config dir, now it is done earlier so it is available for all
hooks.

Note that it is now also done if there are no hooks, but this is
probably enough of an exception case to not warrant the extra plumbing
required to detect the case (and doing an extra bindmount shouldn't
really hurt anyway...).
2012-01-10 21:54:58 +01:00
Matthijs Kooijman ea491a1a1a Fix pathname for running hooks in lb_chroot_hooks.
lb_chroot_hooks would copy the hooks to run to
chroot/root/lb_chroot_hooks, but then try to run them from chroot/root
(which obviously fails). This means lb_chroot_hooks has not been working
for hooks from /usr/share/live/build/hooks since lb_chroot_hooks was
added in revision e4793268. Running hooks from the config directory was
unaffected.
2012-01-10 21:54:58 +01:00
Matthijs Kooijman dbe6a82bc0 Make lb_chroot_hooks work with dash.
Apparently, dash doesn't expand shell patterns within a quoted string,
whereas bash does. We can't remove the quoting entirely, though, since
that would cause problems when $LB_BASE or $_HOOK contains spaces (note
that $_HOOK can probably never contain spaces, but let's handle it just
in case). Only quoting the expansion of $LB_BASE and $_HOOK, but not the
shell pattern should make the hooks work with both bash and dash again.
2012-01-10 21:54:58 +01:00
Daniel Baumann ecbcdaa784 Using xz compression for squashfs only on wheezy and sid for the moment, not artax-backports. 2012-01-07 20:25:54 +01:00
Daniel Baumann 6bb4a22152 Adding temporary hack with pinning to avoid squashfs-tools mismatch for artax-backports. 2012-01-07 20:18:43 +01:00
Daniel Baumann e05fa004ff Correcting assembling of automatic pinning in progress mode. 2012-01-07 19:59:55 +01:00
Daniel Baumann e3c9db7a2b Fix unconditional overwriting of /etc/apt/preferences.d/progress.pref in progress mode. 2012-01-07 19:59:55 +01:00
Daniel Baumann ac004b56d2 Adding support for apt preference.d in config/chroot_apt. 2012-01-07 19:59:53 +01:00
Matthijs Kooijman 4581e49d4e Fixing lb_binary_rootfs leaving the chroot without archives files. 2012-01-03 21:08:34 +01:00
Daniel Baumann e57e3a2bac Creating progress specific disk info files in progress mode. 2011-11-29 16:28:17 +01:00
Daniel Baumann 4272857617 Removing --tasks leftovers in lb_config. 2011-11-02 13:10:54 +01:00
Daniel Baumann fda0dfab52 Adding temporary manual setting of d-i urls for progress. 2011-10-30 09:49:41 +01:00
Daniel Baumann 2c1c76edcf Bail out early in lb_source if source is disabled (Closes: #646807). 2011-10-27 21:58:16 +02:00
Daniel Baumann 0da0a10a95 Also strip out source archives from local archive definitions when using --apt-source-archives false. 2011-10-13 17:44:00 +02:00
Daniel Baumann e9a5afc6cc Deal with non-existing preseed files in config tree. 2011-10-13 09:38:32 +02:00
Daniel Baumann b0454ad434 Correcting wrong location when looking for local preseed files in config tree, thanks to Eugenio Paolantonio <me@medesimo.eu> (Closes: #645116). 2011-10-13 09:38:32 +02:00
Ben Howard d90c311ef9 Adding foreign bootstrap via qemu for cross arch building. 2011-10-05 07:38:53 +02:00
Daniel Baumann 5ec41753cc Adding bug number to comments when moving top-level sources.list. 2011-10-03 12:38:59 +02:00
Ben Howard 0b654837bb Adding check for missing mtab during chrooted binary rootfs stage. 2011-10-01 08:04:57 +02:00
Daniel Baumann fc0d34a31b Making top sources.list conditional, not everyone necessarily always uses that. 2011-09-30 15:42:51 +02:00
Daniel Baumann cf4f1c8ace Treating sources.list top-level file specially to workaround bug in apt that makes sources.list.d sources to be never prefered over main sources.list when using pinning (Closes: #573054). 2011-09-30 15:26:34 +02:00
Colin Watson 5b7adeab62 Copying gfxboot theme when building for Ubuntu. 2011-09-30 12:10:58 +02:00
Daniel Baumann 96e86b96d8 Adding --system option to define the resulting image type to be a live system or a normal, non-live system. 2011-09-30 00:56:49 +02:00
Daniel Baumann 94e610f2e5 Renaming virtual-hdd-root-size to hdd-size in preparation of merging virtual-hdd into hdd. 2011-09-28 11:39:40 +02:00
Daniel Baumann 957cdb7cfe Using 'none' instead of 'plain' when specifying that no chroot filesystem should be used. 2011-09-28 11:17:47 +02:00
Daniel Baumann da0801ebf4 Correcting indenting glitch in lb_binary_chroot. 2011-09-28 11:12:00 +02:00
Daniel Baumann 432402e32b Renaming and reworking previous chroot_local-preseed into chroot_preseed, now looking for config/preseed/*.preseed{,.chroot} files. 2011-09-28 10:11:50 +02:00
Daniel Baumann fbc5aa8291 Removing unused global chroot_preseed. 2011-09-28 09:46:09 +02:00
Daniel Baumann c2b7c107a5 Correcting check for debian-installer-distribution when using daily images in non-derivatives mode. 2011-09-28 07:26:02 +02:00
Daniel Baumann 4b990a72eb Correcting typo in config/includes.chroot creating in lb_config, thanks to Stanislav Bogatyrev <realloc@realloc.spb.ru> for reporting it. 2011-09-27 22:41:56 +02:00
Daniel Baumann 3eeac2e0be Removing leftovers from usb-hdd to hdd removal in lb_binary_hdd and lb_source_hdd. 2011-09-20 12:27:33 +02:00
Daniel Baumann dcfbfc8f8b Correcting incomplete checks for local packages in lb_binary_debian-installer. 2011-09-14 21:44:04 +02:00
Daniel Baumann 358b865e48 Renaming forgotten lb_binary_usb and lb_source_usb to lb_binary_hdd resp. lb_source_hdd. 2011-09-14 21:30:34 +02:00
Daniel Baumann b1cfba42e7 Making sure that volatile for the parent distribution is still included in derivatives mode. 2011-09-14 21:02:17 +02:00
Daniel Baumann ad269a6b71 Updating volatile handling in chroot_archives for derivatives when using foo-backports distribution scheme. 2011-09-14 20:43:20 +02:00
Daniel Baumann f38ef7f469 Renaming usb-hdd binary image type to simply hdd.
This is the first step in conglomerating code for all hdd-ish
image types, independent of the partitioning scheme being used,
and adding future hdd-ish image types for virtualiziation software.
2011-09-13 09:10:30 +02:00
Daniel Baumann bb718340e2 Adding option for setting filesystem label on usb-hdd images. 2011-09-12 09:19:30 +02:00
Daniel Baumann c2633d2405 Correcting syntax error in local package handling. 2011-09-07 17:37:37 +02:00
Daniel Baumann 9119f24831 Also respect config/packages for packages to be installed in both chroot and binary. 2011-09-07 17:33:53 +02:00
Daniel Baumann f8a313ac93 Updating lb_config for config/packages.binary. 2011-09-07 16:41:40 +02:00
Daniel Baumann 04f93bf254 Using config/packages.binary instead of config/binary_local-udebs. 2011-09-07 16:39:37 +02:00
Daniel Baumann d218383d83 Using config/packages.binary instead of config/binary_local-debs. 2011-09-07 16:37:58 +02:00
Daniel Baumann 039df15831 Using config/includes.binary rather than config/binary_local-includes. 2011-09-07 16:33:53 +02:00
Daniel Baumann c1169e2491 Setting origin in apt release files for local packages to config/packages.chroot. 2011-09-07 16:02:03 +02:00
Daniel Baumann 0a32c8b6c0 Renaming lb_chroot_packagelists to lb_chroot_package-lists so that helper matches directory. 2011-09-07 16:00:52 +02:00
Daniel Baumann e82aa25134 Renaming config/chroot_packages to config/packages.chroot. 2011-09-07 15:59:48 +02:00
Daniel Baumann 805fc35877 Improving messages when saving and restoring stage caches (Closes: #589728). 2011-09-07 15:52:23 +02:00
Daniel Baumann fae160f87a Copying chroot.packages.live to binary.packages. 2011-09-07 15:35:37 +02:00
Daniel Baumann 046095cffa Renaming lb_chroot_local-includes into lb_chroot_includes and check for includes in config/includes.chroot. 2011-09-07 15:16:23 +02:00
Daniel Baumann dd853aa5d9 Renaming forgotten lb_binary_local-packagelists to lb_binary_packagelists. 2011-09-07 15:10:09 +02:00
Daniel Baumann fa0ba13de6 Renaming binary.packages list files (that contain what package is installed in the chroot) to chroot as they are build during chroot stage, this fixes some rebuild issues. 2011-09-07 15:08:14 +02:00
Daniel Baumann ed5212022c Completing the restoring of the outer chroot when building in chrooted to not taint subsequent rebuilds of the binary stage with leftovers from the initial lb_binary_rootfs (Closes: #620953). 2011-09-07 14:48:25 +02:00
Daniel Baumann dfaa4a67b5 Doing uuid.conf extraction from initrd with the correct decompression utility (Closes: #637979). 2011-09-07 14:16:05 +02:00
intrigeri 76a6831e0f Fixing typos brought in by ext4 support patch. 2011-08-26 00:23:09 +02:00
Daniel Baumann 5d2fbf5d5a Adding support for ext4 for binary and chroot filesystem, including partial patch from Ben Howard <ben.howard@canonical.com> (Closes: #639298). 2011-08-25 23:47:30 +02:00
Daniel Baumann 7dd4473d5a Renaming --apt-source to --apt-source-archives. 2011-08-24 23:30:22 +02:00
Daniel Baumann 3ceb68b7d4 Introducing --apt-sources option to control if the live system should have deb-src entries in sources.list. 2011-08-24 22:46:32 +02:00
Daniel Baumann 88befb1766 Moving removal of udev persistent rules from chroot_hacks to a hook, that way it can be easily skipped if desired. 2011-08-23 17:13:45 +02:00
Daniel Baumann 9a59c0a2d6 Moving removal of openssh-server host keys from chroot_hacks to a hook, that way it can be easily skipped if desired. 2011-08-23 17:10:38 +02:00
Daniel Baumann 78b10b2bd2 Merging in last bit of lb_chroot_local-packages into lb_chroot_archives (Closes: #635046). 2011-08-16 20:55:47 +02:00
Daniel Baumann 2af22aa1c4 Unifying lb_chroot_packagelists and lb_chroot_local-packagelists. 2011-08-16 20:49:36 +02:00
Daniel Baumann fd344cdbed Correcting wrong variables in volatile handling for derivatives. 2011-08-16 08:40:27 +02:00
Daniel Baumann 557e4c365b Also guarding key additions for local configured archives to not fail if no key is supplied. 2011-08-09 13:05:29 +02:00
Daniel Baumann eedfa8e5ce Guarding archives handling with an additional check to prevent ugly message about files not existing. 2011-08-08 12:39:43 +02:00
Daniel Baumann fabdcdcd13 Removing left-over mentioning of lb_binary_local-hooks instead of lb_binary_hooks in lb_binary. 2011-08-08 08:10:10 +02:00
Daniel Baumann 724f5b4dc8 Also using definition files without suffix (so that e.g. foo.list is used for both chroot and binary stage). 2011-08-08 08:10:07 +02:00
Daniel Baumann 8a0da57266 Reverse keywords in suffix of the package list files for consistency.
Previously, config/package-lists/foo.{binary,chroot}.list was used,
now we use config/package-lists/foo.list.{binary,chroot}.

That way, we're using the same single suffix for all files to make
them specific for either binary and chroot, rather than having
an exception to the rule for package list files.
2011-08-05 08:40:03 +02:00
Daniel Baumann a51393f49b Reverse keywords in suffix of the archive definition files for consistency.
Previously, config/archives/foo.{binary,chroot}.{key,list} was used,
now we use config/archives/foo.{key,list}.{binary,chroot}.

That way, we're using the same single suffix for all files to make
them specific for either binary and chroot, rather than having
an exception to the rule for archive definitions.
2011-08-05 08:28:45 +02:00
Daniel Baumann a56cc98f12 Removing -r from short options in lb_config (Closes: #636208). 2011-08-04 21:32:02 +02:00
intrigeri d8ac62a9ec Cleaning up temporary directories at the same time as other cruft. 2011-08-04 19:46:35 +02:00
Daniel Baumann 17283e776f Correcting typo in lb_config for program variable, thanks to intrigeri <intrigeri@boum.org>. 2011-07-26 14:49:29 +02:00
Daniel Baumann cacf9b6e34 Simplify bind mounting of the config tree during local hooks are run by using read-only bind mounts. 2011-07-25 18:05:40 +02:00
Daniel Baumann 6b63effdff Using 'live' rather than 'incomplete' for cd_type in .disk on images that include debian-installer with live-installer udeb. 2011-07-25 17:15:17 +02:00
Daniel Baumann 2a5263cb39 Updating grub packages list in binary_debian-installer. 2011-07-25 17:13:32 +02:00
Daniel Baumann cfd7f3103b Adding mdadm manually to extra packages for binary pool for being used by debian-installer (Closes: #607225). 2011-07-24 09:19:42 +02:00
Cody A.W. Somerville 50816947a7 Making config tree available to chroot hooks. 2011-07-21 18:35:56 +02:00
Cody A.W. Somerville e01424a1f2 Adding paths for remote debian-installer images on armel. 2011-07-21 17:58:21 +02:00
Daniel Baumann 8316bd2d98 Correcting uuid extraction from initrds in ubuntu mode to work from within binary so that it is cleaned up by lb_clean on failed builds. 2011-07-21 17:24:08 +02:00
Daniel Baumann 0aab94aac9 Calling mkdir with -p to avoid build failures with multiple kernels on disk info in ubuntu mode, thanks to Cody A.W. Somerville <cody.somerville@canonical.com>. 2011-07-21 17:06:54 +02:00
Cody A.W. Somerville 0d2cc22efc Adding function for more resilient detachment of loopback devices. 2011-07-21 17:00:54 +02:00
Cody A.W. Somerville ebc7a72501 Setting partition flags in source_usb after creating the filesystem in order to avoid bug in parted that makes them forget the flags. 2011-07-20 18:39:09 +02:00
Daniel Baumann 346397d2e0 Adding a comment to the chroot calls in excludes handling of binary_chroot whey the chroot function is not used. 2011-07-20 18:24:32 +02:00
Cody A.W. Somerville 651c8aebd2 Updating lb_binary_linux-image to only copy over kernel and initrd if LB_LINUX_PACKAGES doesn't equal 'none'. 2011-07-20 08:48:07 +02:00
Cody A.W. Somerville 31445ed7be Fixing corruption of usb binary images caused by trying to modify flags in partition table when image is mounted with offset. 2011-07-20 08:46:11 +02:00
Daniel Baumann fb2bc99fd5 Reworking binary hooks helper. 2011-07-19 19:03:01 +02:00
Daniel Baumann b70ec215ab Correcting comments in chroot_hooks to match usage. 2011-07-19 16:45:36 +02:00
Daniel Baumann a90294ff53 Calling dpkg-divert with --quiet in chroot_dpkg. 2011-07-19 12:39:47 +02:00
Daniel Baumann e4793268a3 Enabling hooks based on the mode we're building for. 2011-07-19 11:57:21 +02:00
Daniel Baumann ac6147adb7 Consolidating local hooks for chroot and binary into config/hooks/*.{chroot,binary}. 2011-07-19 10:57:02 +02:00
Daniel Baumann ef2752faab Adding kubuntu mode in order to have different defadefault hooks enabled for ubuntu and kubuntu (needed for #630088). 2011-07-19 10:51:20 +02:00
Daniel Baumann b22984f698 Also unmounting /run in lb_clean eventhough it's not really needed anyway but let's be on the caucious side (Closes: #633052). 2011-07-19 10:19:18 +02:00
Daniel Baumann 57ab082265 Using --no-check-gpg option when using debootstrap >= 1.0.30 and apt secure is disabled, thanks to Eugenio Paolantonio <me@medesimo.eu> (Closes: #633356). 2011-07-19 10:13:10 +02:00
Daniel Baumann 330d06708d Skipping binary_linux-image if no kernel was choosen to be installed deliberately, thanks to Adam Conrad <adconrad@ubuntu.com>. 2011-07-16 10:08:42 +02:00
Daniel Baumann 3a44d9acbd Correct gdm/gdm3 handling, prefere gdm for squeeze as before and use gdm3 for everything else. 2011-07-08 18:41:54 +02:00
Richard Nelson ecd8dca2ba Remove lxde test on LB_TASKS for gdm so we now get gdm3. 2011-07-04 18:40:44 -05:00