diff --git a/debian/changelog b/debian/changelog index fab6470b..fba1fe73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -livecd-rootfs (2.46) UNRELEASED; urgency=low +livecd-rootfs (2.46) precise; urgency=low * Guard legacy cloop code in a [ -f ], so it stops failing. + * Don't add the LIVE_TASK for any PREINSTALLED images. - -- Adam Conrad Mon, 05 Dec 2011 15:12:36 -0700 + -- Adam Conrad Mon, 09 Jan 2012 03:23:26 -0700 livecd-rootfs (2.45) precise; urgency=low diff --git a/live-build/auto/config b/live-build/auto/config index 109897f0..019fff75 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -187,13 +187,9 @@ case $PROJECT in ;; esac -case $SUBPROJECT in - wubi) - ;; - *) - add_task live "$LIVE_TASK" - ;; -esac +if [ "$PREINSTALLED" = "true" ]; then + add_task live "$LIVE_TASK" +fi case $PROJECT in ubuntu-dvd)