aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-09-18 15:55:32 -0700
committerBill Nottingham <notting@redhat.com>2008-09-18 15:55:32 -0700
commit2285e2f27e1f9dce216a8b8791bd4f4237bdff80 (patch)
treeecbbc40b35fd8dcfd465d14a7c57b27f90a509d5
parentd786d3a8660766aea95cf256476706eb37bb59d1 (diff)
downloadinitscripts-2285e2f27e1f9dce216a8b8791bd4f4237bdff80.tar
initscripts-2285e2f27e1f9dce216a8b8791bd4f4237bdff80.tar.gz
initscripts-2285e2f27e1f9dce216a8b8791bd4f4237bdff80.tar.bz2
initscripts-2285e2f27e1f9dce216a8b8791bd4f4237bdff80.tar.xz
initscripts-2285e2f27e1f9dce216a8b8791bd4f4237bdff80.zip
Remove hardcoded device-mapper goo.
1) Loading dm-mirror, or dm-crypt, or whatever, will load it anyway. 2) We have udev. It creates device nodes. Why are we doing it by hand?
-rwxr-xr-xrc.d/rc.sysinit12
1 files changed, 0 insertions, 12 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 52e1ca5a..d53378b0 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -330,21 +330,10 @@ sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
update_boot_stage RChostname
action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
-# Device mapper & related initialization
-if ! __fgrep "device-mapper" /proc/devices >/dev/null 2>&1 ; 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
init_crypto 0
fi
-if [ -c /dev/mapper/control ]; then
if ! strstr "$cmdline" nompath && [ -f /etc/multipath.conf -a \
-x /sbin/multipath ]; then
modprobe dm-multipath > /dev/null 2>&1
@@ -369,7 +358,6 @@ if [ -c /dev/mapper/control ]; then
if [ -x /sbin/lvm ]; then
action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --ignorelockingfailure
fi
-fi
if [ -f /etc/crypttab ]; then
init_crypto 0