diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-01-16 10:10:41 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-01-17 17:53:13 +0000 |
| commit | d064ab0bffd429382ea4fafeb144784d403848bd (patch) | |
| tree | 28b0940943acfa742f484c2c0016e8f22c17124c /init | |
| parent | 63d399807de30a64456e672063e7c20babf7aadc (diff) | |
| download | vyos-walinuxagent-d064ab0bffd429382ea4fafeb144784d403848bd.tar.gz vyos-walinuxagent-d064ab0bffd429382ea4fafeb144784d403848bd.zip | |
Import patches-unapplied version 2.2.2-0ubuntu1 to ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: 63d399807de30a64456e672063e7c20babf7aadc
New changelog entries:
* New upstream release (LP: #1651128)
- d/patches/fix-auto-update.patch,
d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
- Dropped as changes have been applied upstream
- Refreshed debian/patches/disable_import_test.patch
Diffstat (limited to 'init')
| -rw-r--r-- | init/clearlinux/waagent.service | 16 | ||||
| -rwxr-xr-x | init/ubuntu/walinuxagent.service | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/init/clearlinux/waagent.service b/init/clearlinux/waagent.service new file mode 100644 index 0000000..9afee45 --- /dev/null +++ b/init/clearlinux/waagent.service @@ -0,0 +1,16 @@ +[Unit] +Description=Azure Linux Agent +Wants=network-online.target sshd.service sshd-keygen.service +After=network-online.target + +ConditionFileIsExecutable=/usr/bin/waagent +ConditionPathExists=/usr/share/defaults/waagent/waagent.conf + +[Service] +Type=simple +ExecStart=/usr/bin/python -u /usr/bin/waagent -daemon +Restart=always +RestartSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/init/ubuntu/walinuxagent.service b/init/ubuntu/walinuxagent.service index ae8dccb..3cf47c5 100755 --- a/init/ubuntu/walinuxagent.service +++ b/init/ubuntu/walinuxagent.service @@ -7,8 +7,8 @@ [Unit] Description=Azure Linux Agent -After=network-online.target cloud-final.service -Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service +After=network-online.target cloud-init.service +Wants=network-online.target sshd.service sshd-keygen.service ConditionFileIsExecutable=/usr/sbin/waagent ConditionPathExists=/etc/waagent.conf |