dracut.conf.d/fedora.conf.example: turn off fips again

use dracut.conf.d/fips.conf.example and install it to
/etc/dracut.conf.d/40-fips.conf to turn it on

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 2b2639eb07ece81d6aeb4bd0808c67845eafc080..a6d22edeee4cbf78d9446d34bc6c42769ff927fc 100644 (file)
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -3,4 +3,4 @@
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-add_dracutmodules+=" rpmversion fips "
+add_dracutmodules+=" rpmversion "

diff --git a/dracut.conf.d/fips.conf.example b/dracut.conf.d/fips.conf.example
new file mode 100644 (file)
index 0000000..ccf56c7
--- /dev/null
+++ b/dracut.conf.d/fips.conf.example
@@ -0,0 +1,3 @@
+# turn on fips module
+
+add_dracutmodules+=" fips "

diff --git a/dracut.spec b/dracut.spec
index ec331d43d6ed97ea710a2d751e97007a979e92af..f3e2061775ef28c0a29baba55baaf7681ac6e932 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -190,6 +190,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
 
 %if 0%{?fedora}
 install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
+install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/40-fips.conf
 %endif
 
 %if 0%{?suse_version}
@@ -278,6 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 %files fips
 %defattr(-,root,root,0755)
 %{_datadir}/dracut/modules.d/01fips
+%config(noreplace) /etc/dracut.conf.d/40-fips.conf
 %endif
 
 %files caps