From: Harald Hoyer <harald@redhat.com>
Date: Fri, 27 Nov 2009 13:55:02 +0000 (+0100)
Subject: fips: do not activate fips module by default
X-Git-Tag: 003~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e939709445a2af7f20bc6348bfe455b30004dd2;p=thirdparty%2Fdracut.git

fips: do not activate fips module by default
---

diff --git a/dracut.spec b/dracut.spec
index 7bf52a6ca..898f8fdee 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -136,6 +136,7 @@ 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/01fips/check
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
diff --git a/modules.d/01fips/check b/modules.d/01fips/check
new file mode 100755
index 000000000..e5cd87e7b
--- /dev/null
+++ b/modules.d/01fips/check
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+. $dracutfunctions
+
+for program in ip arping; do 
+  which $program >/dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    dwarning "Could not find program \"$program\" required by network." 
+    exit 1
+  fi
+done
+for program in dhclient brctl; do
+  which $program >/dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    dwarning "Could not find program \"$program\" it might be required by network." 
+  fi
+done
+exit 255
+