From: Harald Hoyer <harald@redhat.com>
Date: Wed, 9 Jun 2010 09:22:22 +0000 (+0200)
Subject: selinux: move selinux to a separate module
X-Git-Tag: 006~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd987e303699c0f939151065c86bc27c55e9be2a;p=thirdparty%2Fdracut-ng.git

selinux: move selinux to a separate module
---

diff --git a/modules.d/98selinux/check b/modules.d/98selinux/check
new file mode 100755
index 000000000..751b0026f
--- /dev/null
+++ b/modules.d/98selinux/check
@@ -0,0 +1,8 @@
+#!/bin/bash
+[[ $1 = '-h' ]] && {
+    [ -x "/usr/sbin/load_policy" -o -x "/sbin/load_policy" ] || exit 1
+    exit 0
+}
+
+exit 0
+
diff --git a/modules.d/98selinux/install b/modules.d/98selinux/install
new file mode 100755
index 000000000..4216c776a
--- /dev/null
+++ b/modules.d/98selinux/install
@@ -0,0 +1,2 @@
+#!/bin/bash
+inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"
diff --git a/modules.d/99base/selinux-loadpolicy.sh b/modules.d/98selinux/selinux-loadpolicy.sh
similarity index 100%
rename from modules.d/99base/selinux-loadpolicy.sh
rename to modules.d/98selinux/selinux-loadpolicy.sh
diff --git a/modules.d/99base/install b/modules.d/99base/install
index c0dff8cc1..6ba9e7eac 100755
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -23,7 +23,4 @@ fi
 inst "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
 inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
 inst_hook cmdline 20 "$moddir/parse-blacklist.sh"
-if [ -x "/usr/sbin/load_policy" -o -x "/sbin/load_policy" ]; then
-	inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"
-fi
 mkdir -p "${initdir}/var/run"