From f9e78ea98ff921b05c6f3bc79f1ba1f8978accd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mina=20Gali=C4=87?= Date: Sun, 17 Dec 2023 16:23:07 +0000 Subject: [PATCH] fix(setup): Relocate libexec on OpenBSD our setup.py didn't relocate our USR_LIB_EXEC path on OpenBSD. Thus, leaving tools installed in /usr/lib/cloud-init on that platform. OpenBSD ports install things in /usr/local, so follow suit. Sponsored by: The FreeBSD Foundation --- setup.py | 2 +- tools/build-on-openbsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index e40d730e550..0d42774fdd9 100644 --- a/setup.py +++ b/setup.py @@ -178,7 +178,7 @@ def render_tmpl(template, mode=None, is_yaml=False): ETC = "etc" USR_LIB_EXEC = "usr/lib" LIB = "lib" -if os.uname()[0] in ["FreeBSD", "DragonFly"]: +if os.uname()[0] in ["FreeBSD", "DragonFly", "OpenBSD"]: USR = "usr/local" USR_LIB_EXEC = "usr/local/lib" elif os.path.isfile("/etc/redhat-release"): diff --git a/tools/build-on-openbsd b/tools/build-on-openbsd index 611353da3ec..bc551c0da44 100755 --- a/tools/build-on-openbsd +++ b/tools/build-on-openbsd @@ -44,7 +44,7 @@ else RC_LOCAL="/etc/rc.local" RC_LOCAL_CONTENT=" -/usr/lib/cloud-init/ds-identify +/usr/local/lib/cloud-init/ds-identify cloud-init init --local