4248fde1ff
As Fedora will be enabling waagent.service by preset, set a conditional trigger to start only under Microsoft hypervisors. Currently, init/redhat/py2/waagent.service is the packaged systemd service unit, but patch other potentially applicable ones as well. This will be cleaned up in the near future when Fedora support is upstreamed to WALinuxAgent. Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
From dac5101c56b59dbb14d96d4344d6cb2ac047b392 Mon Sep 17 00:00:00 2001
|
|
From: Chris Patterson <cpatterson@microsoft.com>
|
|
Date: Thu, 1 Sep 2022 10:45:47 -0400
|
|
Subject: [PATCH] waagent.service: set ConditionVirtualization=|microsoft
|
|
|
|
Only start waagent service when running under Microsoft virtualization.
|
|
|
|
Set it as a triggering condition to make it easier for downstreams or
|
|
test setups to add another condition (i.e. run outside of hyperv).
|
|
|
|
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
|
|
---
|
|
bin/waagent2.0 | 1 +
|
|
init/redhat/py2/waagent.service | 1 +
|
|
init/redhat/waagent.service | 1 +
|
|
init/waagent.service | 1 +
|
|
4 files changed, 4 insertions(+)
|
|
|
|
diff --git a/bin/waagent2.0 b/bin/waagent2.0
|
|
index 34732677..c84c8c40 100644
|
|
--- a/bin/waagent2.0
|
|
+++ b/bin/waagent2.0
|
|
@@ -1569,6 +1569,7 @@ After=network.target
|
|
After=sshd.service
|
|
ConditionFileIsExecutable=/usr/sbin/waagent
|
|
ConditionPathExists=/etc/waagent.conf
|
|
+ConditionVirtualization=|microsoft
|
|
|
|
[Service]
|
|
Type=simple
|
|
diff --git a/init/redhat/py2/waagent.service b/init/redhat/py2/waagent.service
|
|
index c6d15420..132e7027 100644
|
|
--- a/init/redhat/py2/waagent.service
|
|
+++ b/init/redhat/py2/waagent.service
|
|
@@ -5,6 +5,7 @@ After=network-online.target
|
|
|
|
ConditionFileIsExecutable=/usr/sbin/waagent
|
|
ConditionPathExists=/etc/waagent.conf
|
|
+ConditionVirtualization=|microsoft
|
|
|
|
[Service]
|
|
Type=simple
|
|
diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
|
|
index dc11fbb1..7c93b101 100644
|
|
--- a/init/redhat/waagent.service
|
|
+++ b/init/redhat/waagent.service
|
|
@@ -5,6 +5,7 @@ After=network-online.target
|
|
|
|
ConditionFileIsExecutable=/usr/sbin/waagent
|
|
ConditionPathExists=/etc/waagent.conf
|
|
+ConditionVirtualization=|microsoft
|
|
|
|
[Service]
|
|
Type=simple
|
|
diff --git a/init/waagent.service b/init/waagent.service
|
|
index e91f1433..aa1f3203 100644
|
|
--- a/init/waagent.service
|
|
+++ b/init/waagent.service
|
|
@@ -5,6 +5,7 @@ After=network-online.target
|
|
|
|
ConditionFileIsExecutable=/usr/sbin/waagent
|
|
ConditionPathExists=/etc/waagent.conf
|
|
+ConditionVirtualization=|microsoft
|
|
|
|
[Service]
|
|
Type=simple
|
|
--
|
|
2.37.3
|
|
|