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-08-05 14:20:11.411000000 +0000
3 +++ rc-scripts-0.4.12/rc.d/rc.sysinit 2014-08-05 15:22:35.445000000 +0000
8 -# mdadm - manage MD devices aka Linux Software RAID
9 +# Init software RAID arrays
11 - if [ ! -x /sbin/mdadm -o ! -f /etc/mdadm.conf ]; then
14 + if [ ! -x /sbin/mdadm ]; then
19 - local rc=0 golvm=0 have_md=0
20 if [ ! -f /proc/mdstat ]; then
24 - # assume we have md if at least one ARRAY line is present
25 - if grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf; then
28 - # configured to do auto scanning
29 - if [ $have_md = 0 ] && grep -qE "^([[:blank:]]|)DEVICE[[:blank:]]partitions" /etc/mdadm.conf; then
34 - if [ $have_md = 0 ]; then
38 show "Starting up RAID devices"; busy
39 - /sbin/mdadm --assemble --scan --auto=yes
41 - if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then
42 - # rc is used later too, so set sane value
50 - # A non-zero return means there were problems
51 - if [ $rc -gt 0 ]; then
52 - [ -e /proc/splash ] && echo "verbose" > /proc/splash
53 - show "Starting up RAID devices"; fail
55 - PS1="$(nls '(RAID Repair)# ')"; export PS1
56 - repair_shell "$(nls '*** An error occurred during the RAID startup.')"
58 + output=$(/sbin/mdadm --assemble --scan 2>&1)
61 - # LVM on RAID (keep in sync with LVM init)
62 - if [ "$golvm" -eq "1" ]; then
63 - if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
64 - run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
65 - run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
66 - [ "$lvmversion" = "2" ] && /sbin/vgmknodes
68 + if [ -n "$output" ]; then
71 - show "Starting up RAID devices"; ok
78 run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
79 run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
81 if [ "$lvmversion" = "2" ]; then
82 - /sbin/vgmknodes $lvmignorelocking
83 + # silently refresh LV /dev nodes (just for case)
84 + /sbin/vgmknodes $lvmignorelocking 1>/dev/null 2>&1
85 # display VG statistics
86 /sbin/vgdisplay -s $lvmignorelocking
93 + if ! is_no "$MDADM"; then
97 if ! is_no "$LVM2"; then
101 [ $delay_cryptsetup = 0 ] && ok || fail
104 - if ! is_no "$MDADM"; then
110 if [ -z "$fastboot" ] && [ -z "$nofsck" ]; then