From 6762cc57890a685411a2cd9049dfd886384ab7d8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 2 Nov 2004 05:23:36 +0000 Subject: remove old raidtab code in favor of mdadm --- rc.d/rc.sysinit | 89 --------------------------------------------------------- 1 file changed, 89 deletions(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 71b743df..b74c5298 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -511,95 +511,6 @@ if [ -f /etc/mdadm.conf ]; then /sbin/mdadm -A -s fi -if [ -f /etc/raidtab ]; then - # Add raid devices - [ -f /proc/mdstat ] || modprobe md >/dev/null 2>&1 - - if [ -f /proc/mdstat ]; then - echo -n $"Starting up RAID devices: " - - rc=0 - - for i in `awk '{if ($1=="raiddev") print $2}' /etc/raidtab` - do - RAIDDEV=`basename $i` - RAIDSTAT=`LC_ALL=C grep "^$RAIDDEV : active" /proc/mdstat` - if [ -z "$RAIDSTAT" ]; then - # First scan the /etc/fstab for the "noauto"-flag - # for this device. If found, skip the initialization - # for it to avoid dropping to a shell on errors. - # If not, try raidstart...if that fails then - # fall back to raidadd, raidrun. If that - # also fails, then we drop to a shell - RESULT=1 - INFSTAB=`LC_ALL=C grep -c "^$i" /etc/fstab` - if [ $INFSTAB -eq 0 ] ; then - RESULT=0 - RAIDDEV="$RAIDDEV(skipped)" - fi - NOAUTO=`LC_ALL=C grep "^$i" /etc/fstab | LC_ALL=C fgrep -c "noauto"` - if [ $NOAUTO -gt 0 ]; then - RESULT=0 - RAIDDEV="$RAIDDEV(skipped)" - fi - if [ $RESULT -gt 0 -a -x /sbin/mdadm ]; then - /sbin/mdadm -Ac partitions $i -m dev - RESULT=$? - fi - if [ $RESULT -gt 0 -a -x /sbin/raidstart ]; then - /sbin/raidstart $i - RESULT=$? - fi - if [ $RESULT -gt 0 -a -x /sbin/raid0run ]; then - /sbin/raid0run $i - RESULT=$? - fi - if [ $RESULT -gt 0 -a -x /sbin/raidadd -a -x /sbin/raidrun ]; then - /sbin/raidadd $i - /sbin/raidrun $i - RESULT=$? - fi - if [ $RESULT -gt 0 ]; then - rc=1 - fi - echo -n "$RAIDDEV " - else - echo -n "$RAIDDEV " - fi - done - echo - - # A non-zero return means there were problems. - if [ $rc -gt 0 ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - chvt 1 - fi - echo - echo - echo $"*** An error occurred during the RAID startup" - echo $"*** Dropping you to a shell; the system will reboot" - echo $"*** when you leave the shell." - - str=$"(RAID Repair)" - PS1="$str \# # "; export PS1 - [ "$SELINUX" = "1" ] && disable_selinux - sulogin - - echo $"Unmounting file systems" - umount -a - mount -n -o remount,ro / - echo $"Automatic reboot in progress." - reboot -f - fi - # LVM2 initialization, take 2 - if [ -c /dev/mapper/control -a -x /sbin/lvm.static ]; then - if /sbin/lvm.static vgscan > /dev/null 2>&1 ; then - action $"Setting up Logical Volume Management:" /sbin/lvm.static vgscan --mknodes --ignorelockingfailure && /sbin/lvm.static vgchange -a y --ignorelockingfailure - fi - fi - fi -fi - _RUN_QUOTACHECK=0 # Check filesystems if [ -z "$fastboot" ]; then -- cgit v1.2.1