diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-03-15 10:19:34 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-03-17 13:08:24 +0000 |
| commit | 83be006e288c58a46f5b76c29b6886c1f417d88c (patch) | |
| tree | 91ba57e843714c232b5af5ab8dc6f3322ff7841e /debian/patches | |
| parent | d064ab0bffd429382ea4fafeb144784d403848bd (diff) | |
| download | vyos-walinuxagent-83be006e288c58a46f5b76c29b6886c1f417d88c.tar.gz vyos-walinuxagent-83be006e288c58a46f5b76c29b6886c1f417d88c.zip | |
Import patches-unapplied version 2.2.6-0ubuntu1 to ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: d064ab0bffd429382ea4fafeb144784d403848bd
New changelog entries:
* New upstream release (LP: #1661750).
* debian/control:
- Change the maintainer to Ubuntu Developers (LP: #1657528).
- Add the dependency of isc-dhcp-client as our maintainer scripts assume
it's installed.
- Add trailing commas to dependencies, add whitespaces.
* Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error).
* debian/docs:
- Remove LICENSE.txt as it's redundant.
* debian/postinst:
- Stop checking for update-initramfs existence using the absolute path, use
the 'command' command instead to make lintian happy.
* Remove debian/patches/disable-auto-update.patch:
- We now ship with auto-updates enabled (LP: #1650522).
* debian/maintscript:
- Add a maintscript to rename the old logrotate file on upgrade from an
ancient version of walinuxagent (LP: #1673152).
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/disable-auto-update.patch | 13 | ||||
| -rw-r--r-- | debian/patches/fix-waagent-service.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 0 insertions, 47 deletions
diff --git a/debian/patches/disable-auto-update.patch b/debian/patches/disable-auto-update.patch deleted file mode 100644 index 75e1d6b..0000000 --- a/debian/patches/disable-auto-update.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: walinuxagent-2.2.2/config/ubuntu/waagent.conf -=================================================================== ---- walinuxagent-2.2.2.orig/config/ubuntu/waagent.conf -+++ walinuxagent-2.2.2/config/ubuntu/waagent.conf -@@ -74,7 +74,7 @@ OS.OpensslPath=None - # OS.EnableRDMA=y - - # Enable or disable goal state processing auto-update, default is enabled --# AutoUpdate.Enabled=y -+AutoUpdate.Enabled=n - - # Determine the update family, this should not be changed - # AutoUpdate.GAFamily=Prod diff --git a/debian/patches/fix-waagent-service.patch b/debian/patches/fix-waagent-service.patch deleted file mode 100644 index b00ccb0..0000000 --- a/debian/patches/fix-waagent-service.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/distro/systemd/waagent.service -+++ /dev/null -@@ -1,13 +0,0 @@ --[Unit] --Description=Windows Azure Linux Agent --After=network.target --After=sshd.service --ConditionFileIsExecutable=/usr/sbin/waagent --ConditionPathExists=/etc/waagent.conf -- --[Service] --Type=simple --ExecStart=/usr/sbin/waagent -daemon -- --[Install] --WantedBy=multi-user.target ---- /dev/null -+++ b/distro/systemd/walinuxagent.service -@@ -0,0 +1,14 @@ -+[Unit] -+Description=Windows Azure Linux Agent -+After=network-online.target cloud-final.service -+Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service -+ConditionFileIsExecutable=/usr/sbin/waagent -+ConditionPathExists=/etc/waagent.conf -+ConditionVirtualization=microsoft -+ -+[Service] -+Type=simple -+ExecStart=/usr/sbin/waagent -daemon -+ -+[Install] -+WantedBy=multi-user.target diff --git a/debian/patches/series b/debian/patches/series index 452e72a..05993c8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -disable-auto-update.patch cloud-init-default-cfg.patch disable_import_test.patch disable_udev_overrides.patch |