rc-scripts-raid.patch

   1 diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysinit
   2 --- rc-scripts-0.4.12.orig/rc.d/rc.sysinit      2014-06-19 20:04:44.000000000 +0000
   3 +++ rc-scripts-0.4.12/rc.d/rc.sysinit   2014-07-22 16:10:23.162000000 +0000
   4 @@ -305,61 +305,16 @@
   5
   6  # mdadm - manage MD devices aka Linux Software RAID
   7  init_mdadm() {
   8 -       if [ ! -x /sbin/mdadm -o ! -f /etc/mdadm.conf ]; then
   9 +       if [ ! -x /sbin/mdadm ]; then
  10                 return
  11         fi
  12
  13         modprobe -s md
  14 -       local rc=0 golvm=0 have_md=0
  15         if [ ! -f /proc/mdstat ]; then
  16                 return
  17         fi
  18
  19 -       # assume we have md if at least one ARRAY line is present
  20 -       if grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf; then
  21 -               have_md=1
  22 -       fi
  23 -       # configured to do auto scanning
  24 -       if [ $have_md = 0 ] && grep -qE "^([[:blank:]]|)DEVICE[[:blank:]]partitions" /etc/mdadm.conf; then
  25 -               have_md=1
  26 -       fi
  27 -
  28 -       # none found
  29 -       if [ $have_md = 0 ]; then
  30 -               return
  31 -       fi
  32 -
  33 -       show "Starting up RAID devices"; busy
  34 -       /sbin/mdadm --assemble --scan --auto=yes
  35 -       rc=$?
  36 -       if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then
  37 -               # rc is used later too, so set sane value
  38 -               rc=0
  39 -               deltext; ok
  40 -               golvm=1
  41 -       else
  42 -               deltext; fail
  43 -       fi
  44 -
  45 -       # A non-zero return means there were problems
  46 -       if [ $rc -gt 0 ]; then
  47 -               [ -e /proc/splash ] && echo "verbose" > /proc/splash
  48 -               show "Starting up RAID devices"; fail
  49 -
  50 -               PS1="$(nls '(RAID Repair)# ')"; export PS1
  51 -               repair_shell "$(nls '*** An error occurred during the RAID startup.')"
  52 -       fi
  53 -
  54 -       # LVM on RAID (keep in sync with LVM init)
  55 -       if [ "$golvm" -eq "1" ]; then
  56 -               if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
  57 -                       run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
  58 -                       run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
  59 -                       [ "$lvmversion" = "2" ] && /sbin/vgmknodes
  60 -               fi
  61 -       fi
  62 -       show "Starting up RAID devices"; ok
  63 -       return $rc
  64 +       run_cmd "Starting up RAID devices" /sbin/mdadm --assemble --scan
  65  }
  66
  67  # Init LVM
  68 @@ -832,7 +787,10 @@
  69                 fi
  70         fi
  71
  72 -       # Init LVM
  73 +       if ! is_no "$MDADM"; then
  74 +               init_mdadm
  75 +       fi
  76 +
  77         if ! is_no "$LVM2"; then
  78                 init_lvm
  79         fi
  80 @@ -844,10 +802,6 @@
  81                 [ $delay_cryptsetup = 0 ] && ok || fail
  82         fi
  83
  84 -       if ! is_no "$MDADM"; then
  85 -               init_mdadm
  86 -       fi
  87 -
  88         _RUN_QUOTACHECK=0
  89         # Check filesystems
  90         if [ -z "$fastboot" ] && [ -z "$nofsck" ]; then