From 04ab68a4dd7dada7cd5fa2afc11ce7a12275af14 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Tue, 17 Apr 2012 12:12:56 +0200

Subject: [PATCH] dracut.spec: do not include IMA and selinux modules with

 systemd

---

 dracut.spec |   16 +++++++++++++---

 1 Datei geändert, 13 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)

diff --git a/dracut.spec b/dracut.spec

index 9cd08b7..9f64213 100644

--- a/dracut.spec

+++ b/dracut.spec

@@ -187,6 +187,14 @@ rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni

 # remove gentoo specific modules

 rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash

+%if %{defined _unitdir}

+# with systemd IMA and selinux modules do not make sense

+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs

+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey

+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity

+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98selinux

+%endif

+

 mkdir -p $RPM_BUILD_ROOT/boot/dracut

 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay

 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log

@@ -271,13 +279,15 @@ rm -rf $RPM_BUILD_ROOT

 %{dracutlibdir}/modules.d/95terminfo

 %{dracutlibdir}/modules.d/95udev-rules

 %{dracutlibdir}/modules.d/95virtfs

+%if %{undefined _unitdir}

 %{dracutlibdir}/modules.d/96securityfs

-%{dracutlibdir}/modules.d/97biosdevname

 %{dracutlibdir}/modules.d/97masterkey

-%{dracutlibdir}/modules.d/98ecryptfs

+%{dracutlibdir}/modules.d/98selinux

 %{dracutlibdir}/modules.d/98integrity

+%endif

+%{dracutlibdir}/modules.d/97biosdevname

+%{dracutlibdir}/modules.d/98ecryptfs

 %{dracutlibdir}/modules.d/98pollcdrom

-%{dracutlibdir}/modules.d/98selinux

 %{dracutlibdir}/modules.d/98syslog

 %{dracutlibdir}/modules.d/98usrmount

 %{dracutlibdir}/modules.d/99base