From ed7060ac1d5003f70fc3da4d6006a1a958a47b04 Mon Sep 17 00:00:00 2001 From: Emanuele Giuseppe Esposito Date: Mon, 20 Jun 2022 10:31:14 +0200 Subject: [PATCH 2/2] setup.py: adjust udev/rules default path (#1513) RH-Author: Emanuele Giuseppe Esposito RH-MergeRequest: 80: setup.py: adjust udev/rules default path (#1513) RH-Commit: [2/2] 2cb64b004acbe1b6a30f943b0da51d2d1f2f0d50 (eesposit/cloud-init) RH-Bugzilla: 2096269 RH-Acked-by: Vitaly Kuznetsov RH-Acked-by: Mohamed Gamal Morsy commit 70715125f3af118ae242770e61064c24f41e9a02 Author: Emanuele Giuseppe Esposito Date: Thu Jun 16 20:39:42 2022 +0200 setup.py: adjust udev/rules default path (#1513) RHEL must put cloudinit .rules files in /usr/lib/udev/rules.d This place is a rhel standard and since it is used by all packages cannot be modified. Signed-off-by: Emanuele Giuseppe Esposito Signed-off-by: Emanuele Giuseppe Esposito --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a9132d2c..fdf27cd7 100755 --- a/setup.py +++ b/setup.py @@ -302,6 +302,11 @@ data_files = [ ), ] if not platform.system().endswith("BSD"): + + RULES_PATH = LIB + if os.path.isfile("/etc/redhat-release"): + RULES_PATH = "/usr/lib" + data_files.extend( [ ( @@ -309,7 +314,7 @@ if not platform.system().endswith("BSD"): ["tools/hook-network-manager"], ), (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]), - (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]), + (RULES_PATH + "/udev/rules.d", [f for f in glob("udev/*.rules")]), ( ETC + "/systemd/system/sshd-keygen@.service.d/", ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"], -- 2.31.1