From ca831414fddcc823874a0ed0d8d90e48a5927e59 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 10 Jan 2012 12:41:36 +0000 Subject: [PATCH] Import patches-unapplied version 2.48 to ubuntu/precise Imported using git-ubuntu import. Changelog parent: 4e1df5e183e64968dc473138373ad34dcd1961fc New changelog entries: * Fix sense of live/preinstalled change in 2.46; add the live task for non-preinstalled images, rather than only for preinstalled images. --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 379ef58b..be557642 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.48) precise; urgency=low + + * Fix sense of live/preinstalled change in 2.46; add the live task for + non-preinstalled images, rather than only for preinstalled images. + + -- Colin Watson Tue, 10 Jan 2012 12:41:36 +0000 + livecd-rootfs (2.47) precise; urgency=low * put ti-omap4-ppa into omap4 images diff --git a/live-build/auto/config b/live-build/auto/config index fccbdc8e..7da4a0ad 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -187,7 +187,7 @@ case $PROJECT in ;; esac -if [ "$PREINSTALLED" = "true" ]; then +if [ "$PREINSTALLED" != "true" ]; then add_task live "$LIVE_TASK" fi