48a629
From e210660ecaee3b44a6e8b4e0fe39e4055450696e Mon Sep 17 00:00:00 2001
48a629
From: Ryan McCabe <rmccabe@redhat.com>
48a629
Date: Fri, 10 Nov 2017 10:03:44 -0500
48a629
Subject: [PATCH] Create an explicit enabled file in /run/cloud-init/ to
48a629
 control whether the dhclient and NM hooks run on Azure.
48a629
48a629
X-downstream-only: Yes
48a629
Resolves: rhbz#1474226
48a629
---
48a629
 rhel/systemd/cloud-init-local.service | 3 +++
48a629
 1 file changed, 3 insertions(+)
48a629
48a629
diff --git a/rhel/systemd/cloud-init-local.service b/rhel/systemd/cloud-init-local.service
48a629
index 8174937b..047907c4 100644
48a629
--- a/rhel/systemd/cloud-init-local.service
48a629
+++ b/rhel/systemd/cloud-init-local.service
48a629
@@ -14,6 +14,9 @@ ConditionKernelCommandLine=!cloud-init=disabled
48a629
 
48a629
 [Service]
48a629
 Type=oneshot
48a629
+ExecStartPre=/bin/mkdir -p /run/cloud-init
48a629
+ExecStartPre=/sbin/restorecon /run/cloud-init
48a629
+ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
48a629
 ExecStart=/usr/bin/cloud-init init --local
48a629
 ExecStart=/bin/touch /run/cloud-init/network-config-ready
48a629
 RemainAfterExit=yes
48a629
-- 
48a629
2.13.6
48a629