From 81269b7a62596b6cc8006d8bc2315810c3be45e6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 5 Aug 2014 13:29:22 +0200 Subject: [PATCH] Import patches-unapplied version 2.237 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: c80287984662f1ec8b10cc405e5c5468a248e22d New changelog entries: * ubuntu-core: Add click-systemd to preinstalled image (currently only in a PPA, so can't use tasks for this). --- debian/changelog | 7 +++++++ live-build/auto/config | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3bbf874d..210bd785 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.237) utopic; urgency=medium + + * ubuntu-core: Add click-systemd to preinstalled image (currently only in + a PPA, so can't use tasks for this). + + -- Colin Watson Tue, 05 Aug 2014 13:29:22 +0200 + livecd-rootfs (2.236) utopic; urgency=medium [ James Hunt ] diff --git a/live-build/auto/config b/live-build/auto/config index e51be32d..e8443308 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -342,6 +342,10 @@ case $PROJECT in # we use SUBPROJECT to pass on the information if [ "$SUBPROJECT" = "system-image" ]; then add_task install ubuntu-core + # Only in + # ppa:ubuntu-foundations-team/ubuntu/ubuntu-core-system-image + # at the moment, and PPAs don't have tasks. + add_package install click-systemd # universe needed for 'system-image-cli' COMPONENTS='main restricted universe' fi