From: Harald Hoyer <harald@redhat.com>
Date: Wed, 2 Feb 2011 16:39:45 +0000 (+0100)
Subject: add rpmversion and fips to the fedora default modules
X-Git-Tag: 008~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=051501eea6ecba6f220dd891efc4a3590237aad0;p=thirdparty%2Fdracut.git

add rpmversion and fips to the fedora default modules
---

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index e6fe6774b..2b2639eb0 100644
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -3,3 +3,4 @@
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
+add_dracutmodules+=" rpmversion fips "
diff --git a/dracut.spec b/dracut.spec
index b1e5e8db1..4d71c6d2d 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -165,8 +165,6 @@ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
      sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0%{?with_switch_root}
 
 echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
-rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/check
-rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips/check
 
 %if 0%{?fedora} == 0
 rm -fr $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips