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).
This commit is contained in:
Colin Watson 2014-08-05 13:29:22 +02:00 committed by usd-importer
parent c802879846
commit 81269b7a62
2 changed files with 11 additions and 0 deletions

7
debian/changelog vendored
View File

@ -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 <cjwatson@ubuntu.com> Tue, 05 Aug 2014 13:29:22 +0200
livecd-rootfs (2.236) utopic; urgency=medium
[ James Hunt ]

View File

@ -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