aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc.sysinit
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-08-29 15:54:30 +0000
committerPeter Jones <pjones@redhat.com>2006-08-29 15:54:30 +0000
commit046cac2918762637b8f7088381fc666be54f63b3 (patch)
tree7b6b9d1dd40e6b79064735c82d0a494d4547182b /rc.d/rc.sysinit
parent9799264de5b5951141731c47047388b347e8a061 (diff)
downloadinitscripts-046cac2918762637b8f7088381fc666be54f63b3.tar
initscripts-046cac2918762637b8f7088381fc666be54f63b3.tar.gz
initscripts-046cac2918762637b8f7088381fc666be54f63b3.tar.bz2
initscripts-046cac2918762637b8f7088381fc666be54f63b3.tar.xz
initscripts-046cac2918762637b8f7088381fc666be54f63b3.zip
- don't use nash to create /dev/mapper/control, it isn't hard to do.
- do the first init_crypto call *after* initializing dm.
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-xrc.d/rc.sysinit17
1 files changed, 10 insertions, 7 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 715b05b5..a1c3e6b4 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -389,6 +389,16 @@ if [ -f /etc/mdadm.conf ]; then
/sbin/mdadm -A -s
fi
+# Device mapper & related initialization
+if ! LC_ALL=C fgrep -q "device-mapper" /proc/devices 2>/dev/null ; then
+ modprobe dm-mod >/dev/null 2>&1
+fi
+mkdir -p /dev/mapper >/dev/null 2>&1
+mknod /dev/mapper/control c \
+ $(awk '/ misc$/ { print $1 }' /proc/devices) \
+ $(awk '/ device-mapper$/ { print $1 }' /proc/misc) >/dev/null 2>&1
+[ -n "$SELINUX_STATE" ] && restorecon /dev/mapper /dev/mapper/control >/dev/null 2>&1
+
if [ -f /etc/crypttab ]; then
s=$"Starting disk encryption:"
echo "$s"
@@ -396,13 +406,6 @@ if [ -f /etc/crypttab ]; then
echo
fi
-# Device mapper & related initialization
-if ! LC_ALL=C fgrep -q "device-mapper" /proc/devices 2>/dev/null ; then
- modprobe dm-mod >/dev/null 2>&1
-fi
-echo "mkdmnod" | /sbin/nash --quiet >/dev/null 2>&1
-[ -n "$SELINUX_STATE" ] && restorecon /dev/mapper/control >/dev/null 2>&1
-
if [ -c /dev/mapper/control ]; then
if [ -f /etc/multipath.conf -a -x /sbin/multipath.static ] ; then
modprobe dm-multipath > /dev/null 2>&1