Commit Graph

315 Commits

Author SHA1 Message Date
Daniel Baumann 17b425e9bd Correcting lzcat call in binary_disk to not bail out due to non-standard file extension (unknown suffix -- unchanged), thanks to Luigi Capriotti <l.capriotti@xbmc.org> (Closes: #658995). 2012-02-07 10:11:31 +01:00
Daniel Baumann b1c3aecd28 Handling /etc/resolv.conf even if it's a dangling symlink like with resolv.conf, thanks to Stephane Graber <stgraber@ubuntu.com> (Closes: #657640). 2012-02-07 10:04:51 +01:00
Daniel Baumann 3004ef6851 Shortening kernel and initrd filenames in /live again similar to what we did with in lenny.
Unfortunately, syslinux as of wheezy and newer apparently does not support
long filenames anymore. Therefore, we do have to shorten the filenames
from:

	/live/vmlinuz-3.2.0-1-amd64
	/live/initrd.img-3.2.0-1-amd64

to:

	/live/vmlinuz
	/live/initrd.img

In case more than one kernel flavour is used, the files are being
numbered, starting with vmlinuz1 and initrd1.img.
2012-02-06 23:17:23 +01:00
Daniel Baumann 3f62ac0a3d Cleaning up handling of apt preferences when building in progress mode. 2012-02-06 23:15:13 +01:00
Daniel Baumann bd9b635a0a Simplyfing automatic pinning in derivative modes. 2012-02-06 23:15:13 +01:00
Daniel Baumann d9a0202d1b Dereferencing potential symlinked apt preference files in chroot_apt/*.pref. 2012-02-06 23:15:13 +01:00
Daniel Baumann 7e1fc7431c Avoid removing populated apt preferences file in derivative mode. 2012-02-06 23:15:13 +01:00
Daniel Baumann db4b354436 Improve backports handling in derivatives mode.
If LB_BACKPORTS=true, then backports are configured in sources.list,
however, not enabled.

If backports are enabled depends on pinning, either manually through
apt/preferences.d snipplets in local includes/chroot_apt, or,
depending on distribution (e.g. building artax-backports enables
pinning automatically).
2012-02-06 23:15:13 +01:00
Daniel Baumann 9c9cdbbb33 Removing useless top-comment for /etc/apt/preferences.d/progress.pref. 2012-02-06 23:15:13 +01:00
Daniel Baumann 822dc2c028 Updating year in copyright notices for 2012. 2012-02-06 23:15:12 +01:00
Daniel Baumann 335b5d0352 Using /etc/apt/sources.list.d/debian.list instead of /etc/apt/sources.list in derivative mode. 2012-02-06 23:15:11 +01:00
Daniel Baumann cc9fb10e25 Removing removal of bootstrap-base udeb in binary_debian-installer.
If both bootstrap-base and live-installer are available on the installer,
live-installer is prefereded by d-i (because of the live specific .disk info).

If live-installer is included, can be disabled with live-installer/enable=false
and d-i will use bootstrap-base in order to debootstrap the base system on
/target.
2012-02-06 23:15:11 +01:00
Daniel Baumann d2944e4341 Renaming forgotten binary_packagelists to binary_package-lists to match the rest of lb. 2012-02-06 23:15:11 +01:00
Daniel Baumann 2bcb8b67e4 Avoid warning messages in binary_packagelists for not existing local lists. 2012-02-06 23:15:11 +01:00
Daniel Baumann 0b6d68ce73 Adding note about 404 errors that are on purpose when fetching udebs in derivative mode. 2012-02-06 23:15:11 +01:00
Daniel Baumann 7b99b1a9e9 Giving a note about what mode we are configuring, now that mode is determined automatically based on the host system. 2012-02-06 23:15:11 +01:00
Daniel Baumann 4e2a532f37 Updating lb_binary_syslinux for embedded syslinux themes. 2012-02-06 17:02:58 +01:00
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