From 7e039dbf3ac6a0eea7ae6c673bdbfbec8d7a8047 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Mar 2014 17:14:41 -0600 Subject: Import patches-unapplied version 2.0.3-0ubuntu2 to ubuntu/trusty-proposed Imported using git-ubuntu import. Changelog parent: 3e535e3f3b9b1e44ed9e2394821a4f4799c8245b New changelog entries: * Change /etc/dhcp/dhclient.conf 'send host-name' during post-inst to fix snapshotting instances (LP: #1268050). --- debian/changelog | 13 ++++++++++--- debian/postinst | 9 +++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 debian/postinst diff --git a/debian/changelog b/debian/changelog index 40f29b7..6cd9f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,22 @@ +walinuxagent (2.0.3-0ubuntu2) trusty; urgency=low + + * Change /etc/dhcp/dhclient.conf 'send host-name' during post-inst to + fix snapshotting instances (LP: #1268050). + + -- Ben Howard Tue, 18 Mar 2014 17:14:41 -0600 + walinuxagent (2.0.3-0ubuntu1) trusty; urgency=low * Update to latest upstream version 2.0.3 (LP: #1249052). - - use python-setuptools to do installation, dropping the {pre,post}insts + - use python-setuptools to do installation, dropping the {pre,post}insts. - dropped the walinuxagent-datasaver packages as no longer needed. - use packaged default configuration file by default. - * Include patches from 1.3.x series + * Rebased relevant patches from 1.3.x: - debian/patches/disable_provisioning.patch: disable provisioning features infavor of WALinuxAgent cloud-init support. - debian/patches/disable-udev-rules.patch: disable UDEV rule mangling * Include default Cloud-init configuration - - configures Cloud-init to use the default Azure Datasource + - configures Cloud-init to use the default Azure Datasource. -- Ben Howard Fri, 14 Feb 2014 11:55:14 -0700 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..fd2aa15 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + # fix for LP: 1268050 + sed -i 's|^send host-name "";|send host-name = gethostname();|g' /etc/dhcp/dhclient.conf +fi + +#DEBHELPER# -- cgit v1.2.3