From 650d53d656b612442773453813d8417b234d3752 Mon Sep 17 00:00:00 2001 From: Eduardo Otubo Date: Tue, 23 Jun 2020 14:41:15 +0200 Subject: Change from redhat to rhel in systemd generator tmpl (#450) The name `redhat' is not used but rather `rhel' to identify the distro. Signed-off-by: Eduardo Otubo --- systemd/cloud-init-generator.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'systemd') diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl index 45efa243..0773356b 100755 --- a/systemd/cloud-init-generator.tmpl +++ b/systemd/cloud-init-generator.tmpl @@ -83,7 +83,7 @@ default() { check_for_datasource() { local ds_rc="" -{% if variant in ["redhat", "fedora", "centos"] %} +{% if variant in ["rhel", "fedora", "centos"] %} local dsidentify="/usr/libexec/cloud-init/ds-identify" {% else %} local dsidentify="/usr/lib/cloud-init/ds-identify" -- cgit v1.2.3 From ddc4c2de1b1e716b31384af92f5356bfc6136944 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Tue, 23 Jun 2020 09:43:04 -0400 Subject: cloud-init.service.tmpl: use "rhel" instead of "redhat" (#452) We use "rhel" consistently everywhere else. --- systemd/cloud-init.service.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'systemd') diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl index 9ad3574c..af6d9a8b 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 %} -- cgit v1.2.3