diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2016-09-13 16:11:47 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-09-14 10:39:12 +0000 |
| commit | 5009a9d0f3606fc08a80ec0d59076d8dc48d2f25 (patch) | |
| tree | ad67eef74c5208178950db6ee28195e2137fa713 /init | |
| parent | 0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6 (diff) | |
| download | vyos-walinuxagent-5009a9d0f3606fc08a80ec0d59076d8dc48d2f25.tar.gz vyos-walinuxagent-5009a9d0f3606fc08a80ec0d59076d8dc48d2f25.zip | |
Import patches-unapplied version 2.1.5-0ubuntu1 to ubuntu/yakkety-proposed
Imported using git-ubuntu import.
Changelog parent: 0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6
New changelog entries:
* New upstream release (LP: #1603581)
- d/patches/disable-auto-update.patch:
- The new version introduces auto-updating of the agent to its latest
version via an internal mechanism; disable this
- d/patches/fix_shebangs.patch:
- Dropped in favour of the dh_python3 --shebang option.
- Refreshed d/patches/disable_udev_overrides.patch
Diffstat (limited to 'init')
| -rw-r--r-- | init/coreos/cloud-config.yml | 2 | ||||
| -rwxr-xr-x | init/freebsd/waagent | 18 | ||||
| -rwxr-xr-x | init/ubuntu/walinuxagent.service | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | init/waagent.service | 8 |
4 files changed, 31 insertions, 5 deletions
diff --git a/init/coreos/cloud-config.yml b/init/coreos/cloud-config.yml index 461dc1a..f8efc59 100644 --- a/init/coreos/cloud-config.yml +++ b/init/coreos/cloud-config.yml @@ -47,6 +47,6 @@ coreos: oem: id: azure name: Microsoft Azure - version-id: 2.1.0 + version-id: 2.1.4 home-url: https://azure.microsoft.com/ bug-report-url: https://github.com/coreos/bugs/issues diff --git a/init/freebsd/waagent b/init/freebsd/waagent new file mode 100755 index 0000000..99ddef7 --- /dev/null +++ b/init/freebsd/waagent @@ -0,0 +1,18 @@ +#!/bin/sh + +# PROVIDE: waagent +# REQUIRE: sshd netif dhclient +# KEYWORD: nojail + +. /etc/rc.subr + +PATH=$PATH:/usr/local/bin +name="waagent" +rcvar="waagent_enable" +pidfile="/var/run/waagent.pid" +command="/usr/local/sbin/${name}" +command_interpreter="python" +command_args="start" + +load_rc_config $name +run_rc_command "$1" diff --git a/init/ubuntu/walinuxagent.service b/init/ubuntu/walinuxagent.service index 681435e..ae8dccb 100755 --- a/init/ubuntu/walinuxagent.service +++ b/init/ubuntu/walinuxagent.service @@ -1,3 +1,9 @@ +# +# NOTE: +# This file hosted on WALinuxAgent repository only for reference purposes. +# Please refer to a recent image to find out the up-to-date systemd unit file. +# + [Unit] Description=Azure Linux Agent @@ -9,7 +15,7 @@ ConditionPathExists=/etc/waagent.conf [Service] Type=simple -ExecStart=/usr/bin/python3 /usr/sbin/waagent -daemon +ExecStart=/usr/bin/python3 -u /usr/sbin/waagent -daemon Restart=always [Install] diff --git a/init/waagent.service b/init/waagent.service index f465f79..e91f143 100755..100644 --- a/init/waagent.service +++ b/init/waagent.service @@ -1,14 +1,16 @@ [Unit] Description=Azure Linux Agent -After=network.target -After=sshd.service +Wants=network-online.target sshd.service sshd-keygen.service +After=network-online.target + ConditionFileIsExecutable=/usr/sbin/waagent ConditionPathExists=/etc/waagent.conf [Service] Type=simple -ExecStart=/usr/sbin/waagent -daemon +ExecStart=/usr/bin/python -u /usr/sbin/waagent -daemon Restart=always +RestartSec=5 [Install] WantedBy=multi-user.target |