diff options
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/cloud-init.install | 5 | ||||
| -rw-r--r-- | debian/cloud-init.postinst | 13 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/dirs | 6 | ||||
| -rw-r--r-- | debian/grub-legacy-ec2.install | 4 |
6 files changed, 38 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 124c9012..dbdb9976 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +cloud-init (0.7.7~bzr1189-0ubuntu1) xenial; urgency=medium + + * d/control: adjust build dependency as python3-pyflakes in xenial + now provides python3 modules for pyflakes. + * d/cloud-init.install, d/control, d/dirs, d/grub-legacy-ec2.install: + run wrap-and-sort + * d/cloud-init.install: add lib/udev/ files. + * d/cloud-init.postinst: touch /var/lib/cloud/data/upgraded-network + if upgrading from version that did not have network support. + * New upstream snapshot. + * initial support for support network configuration in cloud-init --local + * do not rely on network metadata service on every boot for + ConfigDrive Openstack Azure (LP: #1553815) + + -- Scott Moser <smoser@ubuntu.com> Thu, 24 Mar 2016 17:36:40 -0400 + cloud-init (0.7.7~bzr1182-0ubuntu1) xenial; urgency=medium * New upstream snapshot. diff --git a/debian/cloud-init.install b/debian/cloud-init.install index d2b624c2..d985f51e 100644 --- a/debian/cloud-init.install +++ b/debian/cloud-init.install @@ -1,10 +1,11 @@ +./tools/21-cloudinit.conf etc/rsyslog.d/ +./tools/Z99-cloud-locale-test.sh etc/profile.d/ etc/cloud etc/init/*.conf lib/systemd/* +lib/udev/* usr/bin usr/lib/cloud-init usr/lib/python*/*-packages/*egg-info usr/lib/python*/*-packages/cloudinit usr/share/doc/cloud-init -./tools/21-cloudinit.conf etc/rsyslog.d/ -./tools/Z99-cloud-locale-test.sh etc/profile.d/ diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst index cfcd4528..dcea5ad7 100644 --- a/debian/cloud-init.postinst +++ b/debian/cloud-init.postinst @@ -201,6 +201,17 @@ cleanup_lp1552999() { "$edir/cloud-init-local.service" "$edir/cloud-init.service" } +disable_network_config_on_upgrade() { + local oldver="$1" last_without_net="0.7.7~bzr1182-0ubuntu1" + if ! -f /var/lib/cloud/instance/obj.pkl ; then + # this is a fresh system not one that has been booted. + return 0 + fi + if dpkg --compare-versions "$oldver" le "$last_without_net"; then + echo "dpkg upgrade from $oldver" > /var/lib/cloud/data/upgraded-network + fi +} + if [ "$1" = "configure" ]; then # disable ureadahead (LP: #499520) dpkg-divert --package cloud-init --rename --divert \ @@ -241,6 +252,8 @@ EOF # fix issue where cloud-init misidentifies the location of grub fix_1336855 + # make upgrades disable network changes by cloud-init + disable_network_config_on_upgrade "$2" fi #DEBHELPER# diff --git a/debian/control b/debian/control index f6bcd2d7..b12f601d 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9), po-debconf, pyflakes, python3, - pyflakes, python3-configobj, python3-httpretty, python3-jinja2, @@ -20,6 +19,7 @@ Build-Depends: debhelper (>= 9), python3-oauthlib, python3-pep8, python3-prettytable, + python3-pyflakes | pyflakes (<< 1.1.0-2), python3-requests, python3-serial, python3-setuptools, diff --git a/debian/dirs b/debian/dirs index f3de468d..f966b7de 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,5 @@ -var/lib/cloud -usr/bin +etc/cloud etc/init +usr/bin usr/share/doc/cloud -etc/cloud +var/lib/cloud diff --git a/debian/grub-legacy-ec2.install b/debian/grub-legacy-ec2.install index c376de13..b75b0bee 100644 --- a/debian/grub-legacy-ec2.install +++ b/debian/grub-legacy-ec2.install @@ -1,4 +1,4 @@ -debian/update-grub-legacy-ec2 usr/sbin -debian/grub-set-default-legacy-ec2 usr/sbin debian/grub-set-default usr/sbin +debian/grub-set-default-legacy-ec2 usr/sbin debian/kernel etc/kernel/ +debian/update-grub-legacy-ec2 usr/sbin |