From nobody Mon Feb 9 12:24:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1547058977470966.9684117842486; Wed, 9 Jan 2019 10:36:17 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 069E62CD7EB; Wed, 9 Jan 2019 18:36:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5B4C8517; Wed, 9 Jan 2019 18:36:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 61973184B54A; Wed, 9 Jan 2019 18:36:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IaAFg026142 for ; Wed, 9 Jan 2019 13:36:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5A95E299C2; Wed, 9 Jan 2019 18:36:10 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D529517C1A for ; Wed, 9 Jan 2019 18:36:09 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:53 +0100 Message-Id: <20190109183554.12296-7-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/7] apparmor: Move static data out of examples/ X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 09 Jan 2019 18:36:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" These files need to be installed on the system for apparmor support to work, so they don't belong with examples. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- examples/Makefile.am | 40 ------------------- src/security/Makefile.inc.am | 40 +++++++++++++++++++ .../security}/apparmor/TEMPLATE.lxc | 0 .../security}/apparmor/TEMPLATE.qemu | 0 .../security}/apparmor/libvirt-lxc | 0 .../security}/apparmor/libvirt-qemu | 0 .../apparmor/usr.lib.libvirt.virt-aa-helper | 0 .../security}/apparmor/usr.sbin.libvirtd | 0 8 files changed, 40 insertions(+), 40 deletions(-) rename {examples =3D> src/security}/apparmor/TEMPLATE.lxc (100%) rename {examples =3D> src/security}/apparmor/TEMPLATE.qemu (100%) rename {examples =3D> src/security}/apparmor/libvirt-lxc (100%) rename {examples =3D> src/security}/apparmor/libvirt-qemu (100%) rename {examples =3D> src/security}/apparmor/usr.lib.libvirt.virt-aa-helpe= r (100%) rename {examples =3D> src/security}/apparmor/usr.sbin.libvirtd (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 76907a1c8f..e2ec6e7fba 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -19,12 +19,6 @@ FILTERS =3D $(wildcard $(srcdir)/xml/nwfilter/*.xml) =20 EXTRA_DIST =3D \ - apparmor/TEMPLATE.qemu \ - apparmor/TEMPLATE.lxc \ - apparmor/libvirt-qemu \ - apparmor/libvirt-lxc \ - apparmor/usr.lib.libvirt.virt-aa-helper \ - apparmor/usr.sbin.libvirtd \ lxcconvert/virt-lxc-convert \ polkit/libvirt-acl.rules \ $(wildcard $(srcdir)/systemtap/*.stp) \ @@ -70,40 +64,6 @@ admin_logging_SOURCES =3D admin/logging.c INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D =20 -if WITH_APPARMOR_PROFILES -apparmordir =3D $(sysconfdir)/apparmor.d/ -apparmor_DATA =3D \ - apparmor/usr.lib.libvirt.virt-aa-helper \ - apparmor/usr.sbin.libvirtd \ - $(NULL) - -abstractionsdir =3D $(apparmordir)/abstractions -abstractions_DATA =3D \ - apparmor/libvirt-qemu \ - apparmor/libvirt-lxc \ - $(NULL) - -templatesdir =3D $(apparmordir)/libvirt -templates_DATA =3D \ - apparmor/TEMPLATE.qemu \ - apparmor/TEMPLATE.lxc \ - $(NULL) - -APPARMOR_LOCAL_DIR =3D "$(DESTDIR)$(apparmordir)/local" -install-apparmor-local: - $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - echo "# Site-specific additions and overrides for \ - 'usr.lib.libvirt.virt-aa-helper'" \ - >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" - -uninstall-apparmor-local: - rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" - rmdir "$(APPARMOR_LOCAL_DIR)" || : - -INSTALL_DATA_LOCAL +=3D install-apparmor-local -UNINSTALL_LOCAL +=3D uninstall-apparmor-local -endif WITH_APPARMOR_PROFILES - if WITH_NWFILTER NWFILTER_DIR =3D "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" =20 diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 0ade97d355..b24cdfd083 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -32,6 +32,12 @@ EXTRA_DIST +=3D \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) \ + security/apparmor/TEMPLATE.qemu \ + security/apparmor/TEMPLATE.lxc \ + security/apparmor/libvirt-qemu \ + security/apparmor/libvirt-lxc \ + security/apparmor/usr.lib.libvirt.virt-aa-helper \ + security/apparmor/usr.sbin.libvirtd \ $(NULL) =20 libvirt_security_manager_la_SOURCES =3D $(SECURITY_DRIVER_SOURCES) @@ -80,3 +86,37 @@ virt_aa_helper_CFLAGS =3D \ $(NULL) endif WITH_LIBVIRTD endif WITH_SECDRIVER_APPARMOR + +if WITH_APPARMOR_PROFILES +apparmordir =3D $(sysconfdir)/apparmor.d/ +apparmor_DATA =3D \ + security/apparmor/usr.lib.libvirt.virt-aa-helper \ + security/apparmor/usr.sbin.libvirtd \ + $(NULL) + +abstractionsdir =3D $(apparmordir)/abstractions +abstractions_DATA =3D \ + security/apparmor/libvirt-qemu \ + security/apparmor/libvirt-lxc \ + $(NULL) + +templatesdir =3D $(apparmordir)/libvirt +templates_DATA =3D \ + security/apparmor/TEMPLATE.qemu \ + security/apparmor/TEMPLATE.lxc \ + $(NULL) + +APPARMOR_LOCAL_DIR =3D "$(DESTDIR)$(apparmordir)/local" +install-apparmor-local: + $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" + echo "# Site-specific additions and overrides for \ + 'usr.lib.libvirt.virt-aa-helper'" \ + >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" + +uninstall-apparmor-local: + rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" + rmdir "$(APPARMOR_LOCAL_DIR)" || : + +INSTALL_DATA_LOCAL +=3D install-apparmor-local +UNINSTALL_LOCAL +=3D uninstall-apparmor-local +endif WITH_APPARMOR_PROFILES diff --git a/examples/apparmor/TEMPLATE.lxc b/src/security/apparmor/TEMPLAT= E.lxc similarity index 100% rename from examples/apparmor/TEMPLATE.lxc rename to src/security/apparmor/TEMPLATE.lxc diff --git a/examples/apparmor/TEMPLATE.qemu b/src/security/apparmor/TEMPLA= TE.qemu similarity index 100% rename from examples/apparmor/TEMPLATE.qemu rename to src/security/apparmor/TEMPLATE.qemu diff --git a/examples/apparmor/libvirt-lxc b/src/security/apparmor/libvirt-= lxc similarity index 100% rename from examples/apparmor/libvirt-lxc rename to src/security/apparmor/libvirt-lxc diff --git a/examples/apparmor/libvirt-qemu b/src/security/apparmor/libvirt= -qemu similarity index 100% rename from examples/apparmor/libvirt-qemu rename to src/security/apparmor/libvirt-qemu diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/src/securit= y/apparmor/usr.lib.libvirt.virt-aa-helper similarity index 100% rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper rename to src/security/apparmor/usr.lib.libvirt.virt-aa-helper diff --git a/examples/apparmor/usr.sbin.libvirtd b/src/security/apparmor/us= r.sbin.libvirtd similarity index 100% rename from examples/apparmor/usr.sbin.libvirtd rename to src/security/apparmor/usr.sbin.libvirtd --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list