From fca5765e72b11890a1f338db133589eef8cbb065 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 23 Jul 2012 17:57:59 +0100 Subject: [PATCH] Import patches-unapplied version 2.71 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: 219d69bc3dc366deb01f24c4ba8f38f03cf30852 New changelog entries: * live-build/auto/config: Don't purge .pyc files on ubuntu-server images. * live-build/auto/config: Build ubuntu-server with --debian-installer=live. --- debian/changelog | 8 ++++++++ live-build/auto/config | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1709a72e..404a32bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.71) quantal; urgency=low + + * live-build/auto/config: Don't purge .pyc files on ubuntu-server images. + * live-build/auto/config: Build ubuntu-server with + --debian-installer=live. + + -- Colin Watson Mon, 23 Jul 2012 17:57:59 +0100 + livecd-rootfs (2.70) quantal; urgency=low * live-build/auto/config: Don't install lupin-casper on ubuntu-server diff --git a/live-build/auto/config b/live-build/auto/config index 8cf7ef87..7922bb13 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -199,6 +199,7 @@ case $PROJECT in add_task install minimal standard server COMPONENTS='main' PREINSTALL_POOL_SEEDS='server-ship' + OPTS="${OPTS:+$OPTS }--debian-installer=live" ;; ubuntu-core) @@ -284,7 +285,9 @@ boot/initrd.img-* EOF fi -ln -s /usr/share/live/build/examples/hooks/all_chroot_pyc-purge.sh config/chroot_local-hooks/ +if [ "$PROJECT" != ubuntu-server ]; then + ln -s /usr/share/live/build/examples/hooks/all_chroot_pyc-purge.sh config/chroot_local-hooks/ +fi case $PROJECT in kubuntu|kubuntu-active)