|
 |
0eeb87 |
From 65b26a20b550ae301ca33eafe062a873f53969de Mon Sep 17 00:00:00 2001
|
|
|
0eeb87 |
From: Eduardo Otubo <otubo@redhat.com>
|
|
|
0eeb87 |
Date: Wed, 24 Jun 2020 07:34:32 +0200
|
|
|
0eeb87 |
Subject: [PATCH 3/4] Change from redhat to rhel in systemd generator tmpl
|
|
|
0eeb87 |
(#450)
|
|
|
0eeb87 |
|
|
|
0eeb87 |
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
|
0eeb87 |
Message-id: <20200623154034.28563-3-otubo@redhat.com>
|
|
|
0eeb87 |
Patchwork-id: 97783
|
|
|
0eeb87 |
O-Subject: [RHEL-8.3.0/RHEL-8.2.1 cloud-init PATCH 2/3] Change from redhat to rhel in systemd generator tmpl (#450)
|
|
|
0eeb87 |
Bugzilla: 1834173
|
|
|
0eeb87 |
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
|
0eeb87 |
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
|
0eeb87 |
|
|
|
0eeb87 |
commit 650d53d656b612442773453813d8417b234d3752
|
|
|
0eeb87 |
Author: Eduardo Otubo <otubo@redhat.com>
|
|
|
0eeb87 |
Date: Tue Jun 23 14:41:15 2020 +0200
|
|
|
0eeb87 |
|
|
|
0eeb87 |
Change from redhat to rhel in systemd generator tmpl (#450)
|
|
|
0eeb87 |
|
|
|
0eeb87 |
The name `redhat' is not used but rather `rhel' to identify the distro.
|
|
|
0eeb87 |
|
|
|
0eeb87 |
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
0eeb87 |
|
|
|
0eeb87 |
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
0eeb87 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0eeb87 |
---
|
|
|
0eeb87 |
systemd/cloud-init-generator.tmpl | 2 +-
|
|
|
0eeb87 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0eeb87 |
|
|
|
0eeb87 |
diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl
|
|
|
0eeb87 |
index 45efa24..0773356 100755
|
|
|
0eeb87 |
--- a/systemd/cloud-init-generator.tmpl
|
|
|
0eeb87 |
+++ b/systemd/cloud-init-generator.tmpl
|
|
|
0eeb87 |
@@ -83,7 +83,7 @@ default() {
|
|
|
0eeb87 |
|
|
|
0eeb87 |
check_for_datasource() {
|
|
|
0eeb87 |
local ds_rc=""
|
|
|
0eeb87 |
-{% if variant in ["redhat", "fedora", "centos"] %}
|
|
|
0eeb87 |
+{% if variant in ["rhel", "fedora", "centos"] %}
|
|
|
0eeb87 |
local dsidentify="/usr/libexec/cloud-init/ds-identify"
|
|
|
0eeb87 |
{% else %}
|
|
|
0eeb87 |
local dsidentify="/usr/lib/cloud-init/ds-identify"
|
|
|
0eeb87 |
--
|
|
|
0eeb87 |
1.8.3.1
|
|
|
0eeb87 |
|