summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2014-04-07 16:48:16 -0600
committerusd-importer <ubuntu-server@lists.ubuntu.com>2014-04-08 16:53:31 +0000
commit8b689f4b02b11c2fbdef42fcc6e7707ead68370a (patch)
tree523e3a30278baa00480a3b170685fcdd1ccd26c6 /debian
parentfa2cfb7ad423ad3c9c4243ca8b678f6a7501b87a (diff)
parente39df013bfaf227cd8617b26abbde14c47f2f8b7 (diff)
downloadvyos-walinuxagent-8b689f4b02b11c2fbdef42fcc6e7707ead68370a.tar.gz
vyos-walinuxagent-8b689f4b02b11c2fbdef42fcc6e7707ead68370a.zip
Import patches-applied version 2.0.4-0ubuntu1 to applied/ubuntu/trusty-proposed
Imported using git-ubuntu import. Changelog parent: fa2cfb7ad423ad3c9c4243ca8b678f6a7501b87a Unapplied parent: e39df013bfaf227cd8617b26abbde14c47f2f8b7 New changelog entries: * Update to latest upstream version 2.0.4 (LP: #1304023). - Includes ability for agent injection.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/disable-udev-rules.patch2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 6cd9f8b..c42e5f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+walinuxagent (2.0.4-0ubuntu1) trusty; urgency=medium
+
+ * Update to latest upstream version 2.0.4 (LP: #1304023).
+ - Includes ability for agent injection.
+
+ -- Ben Howard <ben.howard@ubuntu.com> Mon, 07 Apr 2014 16:48:16 -0600
+
walinuxagent (2.0.3-0ubuntu2) trusty; urgency=low
* Change /etc/dhcp/dhclient.conf 'send host-name' during post-inst to
diff --git a/debian/patches/disable-udev-rules.patch b/debian/patches/disable-udev-rules.patch
index ba96a2d..56c5acf 100644
--- a/debian/patches/disable-udev-rules.patch
+++ b/debian/patches/disable-udev-rules.patch
@@ -5,7 +5,7 @@ Author: Ben Howard
Last-Update: 2013-07-11
--- a/waagent
+++ b/waagent
-@@ -87,8 +87,7 @@
+@@ -90,8 +90,7 @@
VMM_STARTUP_SCRIPT_NAME='install'
VMM_CONFIG_FILE_NAME='linuxosconfiguration.xml'
global RulesFiles