summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2014-03-18 17:14:41 -0600
committerusd-importer <ubuntu-server@lists.ubuntu.com>2014-03-18 23:38:27 +0000
commitfa2cfb7ad423ad3c9c4243ca8b678f6a7501b87a (patch)
treed88d874efb1c83a8b1669c20cdd056151c82cb57
parente3f7e87a22b44d365817f959489154f548a59be4 (diff)
parent44f40b0e8dea5b30728f541585e897d28a38746d (diff)
downloadvyos-walinuxagent-fa2cfb7ad423ad3c9c4243ca8b678f6a7501b87a.tar.gz
vyos-walinuxagent-fa2cfb7ad423ad3c9c4243ca8b678f6a7501b87a.zip
Import patches-applied version 2.0.3-0ubuntu2 to applied/ubuntu/trusty-proposed
Imported using git-ubuntu import. Changelog parent: e3f7e87a22b44d365817f959489154f548a59be4 Unapplied parent: 44f40b0e8dea5b30728f541585e897d28a38746d New changelog entries: * Change /etc/dhcp/dhclient.conf 'send host-name' during post-inst to fix snapshotting instances (LP: #1268050).
-rw-r--r--debian/changelog13
-rw-r--r--debian/postinst9
2 files changed, 19 insertions, 3 deletions
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 <ben.howard@ubuntu.com> 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 <ben.howard@ubuntu.com> 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 "<hostname>";|send host-name = gethostname();|g' /etc/dhcp/dhclient.conf
+fi
+
+#DEBHELPER#