From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 18 Aug 2020 23:39:19 +0000 (+0200)
Subject: meson: Don't hardcode /etc in APPARMOR_DIR
X-Git-Tag: v6.7.0-rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=308904472b8e956b17c0eccfbdb21ea0d142a4d0;p=thirdparty%2Flibvirt.git

meson: Don't hardcode /etc in APPARMOR_DIR

src/security/apparmor/meson.build builds this path dynamically
based on the value of sysconfdir, so we should do the same here
or the code and the filesystem might end up disagreeing.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---

diff --git a/meson.build b/meson.build
index c10b63ba69..2846c9b9f2 100644
--- a/meson.build
+++ b/meson.build
@@ -970,7 +970,7 @@ if apparmor_dep.found()
     conf.set('WITH_APPARMOR_PROFILES', 1)
   endif
   conf.set('WITH_APPARMOR', 1)
-  conf.set_quoted('APPARMOR_DIR', '/etc/apparmor.d')
+  conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d')
   conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles')
 endif