From e1795a5cd1cb216e5514f55bdb1cddc605f40df3 Mon Sep 17 00:00:00 2001 From: Ryan Harper Date: Wed, 19 Jun 2019 17:16:08 +0000 Subject: cloud-init-generator: use libexec path to ds-identify on redhat systems Update the template to use libexec prefix path to ds-identify on redhat systems. LP: #1833264 --- systemd/cloud-init-generator.tmpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl index cfa5eb53..45efa243 100755 --- a/systemd/cloud-init-generator.tmpl +++ b/systemd/cloud-init-generator.tmpl @@ -82,7 +82,12 @@ default() { } check_for_datasource() { - local ds_rc="" dsidentify="/usr/lib/cloud-init/ds-identify" + local ds_rc="" +{% if variant in ["redhat", "fedora", "centos"] %} + local dsidentify="/usr/libexec/cloud-init/ds-identify" +{% else %} + local dsidentify="/usr/lib/cloud-init/ds-identify" +{% endif %} if [ ! -x "$dsidentify" ]; then debug 1 "no ds-identify in $dsidentify. _RET=$FOUND" return 0 -- cgit v1.2.3