diff --git a/debian/changelog b/debian/changelog index be557642..654390f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.49) precise; urgency=low + + [ Adam Conrad ] + * Update maintainer to Ubuntu Developers, LaMont doesn't upload much. + + [ Colin Watson ] + * Get live-build to divert update-initramfs while building the chroot. + This should cut a few minutes off builds, particularly on slow + architectures. + + -- Colin Watson Mon, 16 Jan 2012 12:53:23 +0000 + livecd-rootfs (2.48) precise; urgency=low * Fix sense of live/preinstalled change in 2.46; add the live task for diff --git a/debian/control b/debian/control index 50190713..5fd67cca 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: livecd-rootfs Section: devel Priority: optional Build-Depends: debhelper (>= 7) -Maintainer: LaMont Jones +Maintainer: Ubuntu Developers Standards-Version: 3.6.1.0 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk diff --git a/live-build/auto/build b/live-build/auto/build index a7ccd842..448de7da 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -26,6 +26,27 @@ Expire-Date: 0 fi lb bootstrap "$@" + + Chroot chroot "dpkg-divert --quiet --add \ + --divert /usr/sbin/update-initramfs.REAL --rename \ + /usr/sbin/update-initramfs" + cat > chroot/usr/sbin/update-initramfs <<'EOF' +#! /bin/sh +if [ $# != 1 ] || [ "$1" != -u ]; then + exec update-initramfs.REAL "$@" +fi +echo "update-initramfs: diverted by livecd-rootfs (will be called later)" >&2 +exit 0 +EOF + chmod +x chroot/usr/sbin/update-initramfs + + cat > config/chroot_local-hooks/zz-undivert-update-initramfs.sh <<'EOF' +#! /bin/sh +rm -f /usr/sbin/update-initramfs +dpkg-divert --quiet --remove --rename /usr/sbin/update-initramfs +EOF + chmod +x config/chroot_local-hooks/zz-undivert-update-initramfs.sh + lb chroot "$@" if [ -d chroot/var/lib/preinstalled-pool ]; then