forked from rpms/cloud-init
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
|
From f67f56e85c0fdb1c94527a6a1795bbacd2e6fdb0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Wed, 24 Jun 2020 07:34:34 +0200
|
||
|
|
Subject: [PATCH 4/4] cloud-init.service.tmpl: use "rhel" instead of "redhat"
|
||
|
|
(#452)
|
||
|
|
|
||
|
|
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Message-id: <20200623154034.28563-4-otubo@redhat.com>
|
||
|
|
Patchwork-id: 97784
|
||
|
|
O-Subject: [RHEL-8.3.0/RHEL-8.2.1 cloud-init PATCH 3/3] cloud-init.service.tmpl: use "rhel" instead of "redhat" (#452)
|
||
|
|
Bugzilla: 1834173
|
||
|
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||
|
|
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||
|
|
|
||
|
|
From: Daniel Watkins <oddbloke@ubuntu.com>
|
||
|
|
|
||
|
|
commit ddc4c2de1b1e716b31384af92f5356bfc6136944
|
||
|
|
Author: Daniel Watkins <oddbloke@ubuntu.com>
|
||
|
|
Date: Tue Jun 23 09:43:04 2020 -0400
|
||
|
|
|
||
|
|
cloud-init.service.tmpl: use "rhel" instead of "redhat" (#452)
|
||
|
|
|
||
|
|
We use "rhel" consistently everywhere else.
|
||
|
|
|
||
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
systemd/cloud-init.service.tmpl | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
||
|
|
index 9ad3574..af6d9a8 100644
|
||
|
|
--- a/systemd/cloud-init.service.tmpl
|
||
|
|
+++ b/systemd/cloud-init.service.tmpl
|
||
|
|
@@ -10,7 +10,7 @@ After=systemd-networkd-wait-online.service
|
||
|
|
{% if variant in ["ubuntu", "unknown", "debian"] %}
|
||
|
|
After=networking.service
|
||
|
|
{% endif %}
|
||
|
|
-{% if variant in ["centos", "fedora", "redhat"] %}
|
||
|
|
+{% if variant in ["centos", "fedora", "rhel"] %}
|
||
|
|
After=network.service
|
||
|
|
After=NetworkManager.service
|
||
|
|
{% endif %}
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|