Chris Patterson 4248fde
From dac5101c56b59dbb14d96d4344d6cb2ac047b392 Mon Sep 17 00:00:00 2001
Chris Patterson 4248fde
From: Chris Patterson <cpatterson@microsoft.com>
Chris Patterson 4248fde
Date: Thu, 1 Sep 2022 10:45:47 -0400
Chris Patterson 4248fde
Subject: [PATCH] waagent.service: set ConditionVirtualization=|microsoft
Chris Patterson 4248fde
Chris Patterson 4248fde
Only start waagent service when running under Microsoft virtualization.
Chris Patterson 4248fde
Chris Patterson 4248fde
Set it as a triggering condition to make it easier for downstreams or
Chris Patterson 4248fde
test setups to add another condition (i.e. run outside of hyperv).
Chris Patterson 4248fde
Chris Patterson 4248fde
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
Chris Patterson 4248fde
---
Chris Patterson 4248fde
 bin/waagent2.0                   | 1 +
Chris Patterson 4248fde
 init/redhat/py2/waagent.service  | 1 +
Chris Patterson 4248fde
 init/redhat/waagent.service      | 1 +
Chris Patterson 4248fde
 init/waagent.service             | 1 +
Chris Patterson 4248fde
 4 files changed, 4 insertions(+)
Chris Patterson 4248fde
Chris Patterson 4248fde
diff --git a/bin/waagent2.0 b/bin/waagent2.0
Chris Patterson 4248fde
index 34732677..c84c8c40 100644
Chris Patterson 4248fde
--- a/bin/waagent2.0
Chris Patterson 4248fde
+++ b/bin/waagent2.0
Chris Patterson 4248fde
@@ -1569,6 +1569,7 @@ After=network.target
Chris Patterson 4248fde
 After=sshd.service
Chris Patterson 4248fde
 ConditionFileIsExecutable=/usr/sbin/waagent
Chris Patterson 4248fde
 ConditionPathExists=/etc/waagent.conf
Chris Patterson 4248fde
+ConditionVirtualization=|microsoft
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 [Service]
Chris Patterson 4248fde
 Type=simple
Chris Patterson 4248fde
diff --git a/init/redhat/py2/waagent.service b/init/redhat/py2/waagent.service
Chris Patterson 4248fde
index c6d15420..132e7027 100644
Chris Patterson 4248fde
--- a/init/redhat/py2/waagent.service
Chris Patterson 4248fde
+++ b/init/redhat/py2/waagent.service
Chris Patterson 4248fde
@@ -5,6 +5,7 @@ After=network-online.target
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 ConditionFileIsExecutable=/usr/sbin/waagent
Chris Patterson 4248fde
 ConditionPathExists=/etc/waagent.conf
Chris Patterson 4248fde
+ConditionVirtualization=|microsoft
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 [Service]
Chris Patterson 4248fde
 Type=simple
Chris Patterson 4248fde
diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
Chris Patterson 4248fde
index dc11fbb1..7c93b101 100644
Chris Patterson 4248fde
--- a/init/redhat/waagent.service
Chris Patterson 4248fde
+++ b/init/redhat/waagent.service
Chris Patterson 4248fde
@@ -5,6 +5,7 @@ After=network-online.target
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 ConditionFileIsExecutable=/usr/sbin/waagent
Chris Patterson 4248fde
 ConditionPathExists=/etc/waagent.conf
Chris Patterson 4248fde
+ConditionVirtualization=|microsoft
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 [Service]
Chris Patterson 4248fde
 Type=simple
Chris Patterson 4248fde
diff --git a/init/waagent.service b/init/waagent.service
Chris Patterson 4248fde
index e91f1433..aa1f3203 100644
Chris Patterson 4248fde
--- a/init/waagent.service
Chris Patterson 4248fde
+++ b/init/waagent.service
Chris Patterson 4248fde
@@ -5,6 +5,7 @@ After=network-online.target
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 ConditionFileIsExecutable=/usr/sbin/waagent
Chris Patterson 4248fde
 ConditionPathExists=/etc/waagent.conf
Chris Patterson 4248fde
+ConditionVirtualization=|microsoft
Chris Patterson 4248fde
 
Chris Patterson 4248fde
 [Service]
Chris Patterson 4248fde
 Type=simple
Chris Patterson 4248fde
-- 
Chris Patterson 4248fde
2.37.3
Chris Patterson 4248fde