From 35251d626be197aae93c082c48ffc67dad49ed42 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 22 Apr 2015 16:03:42 -0700 Subject: [PATCH] Import patches-unapplied version 2.300 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 7774d33c9b1ec87ec2a86daf500500dffc2bb8b8 New changelog entries: * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: revert removal of python from the rootfs temporarily, since we've manually re-added it to the seed in order to make walinuxagent work again on the azure image. --- debian/changelog | 9 +++++++++ .../ubuntu-core/hooks/11-remove-extra-packages.chroot | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb3798e2..6027d285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.300) vivid; urgency=medium + + * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: revert + removal of python from the rootfs temporarily, since we've manually + re-added it to the seed in order to make walinuxagent work again on the + azure image. + + -- Steve Langasek Wed, 22 Apr 2015 16:03:42 -0700 + livecd-rootfs (2.299) vivid; urgency=medium * Fix snappy motd to not reference 'development', which isn't always true. diff --git a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot index 38cacf9e..f9c1ffe0 100644 --- a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot +++ b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot @@ -9,6 +9,3 @@ apt-get purge -y locales # system-image-cli in vivid does no longer depend on # ubuntu-download-manager apt-get purge -y libicu52 - -# no more py2, yay -apt-get purge -y python python-minimal libpython-stdlib python2.* libpython2.*