View | Details | Raw Unified | Return to bug 130693
Collapse All | Expand All

(-)mkinitrd.orig (-4 / +27 lines)
Lines 1612-1618 Link Here
1612
	|	debug_linuxrc=1
1612
	|	debug_linuxrc=1
1613
	|	;;
1613
	|	;;
1614
	|    noresume)
1614
	|    noresume)
1615
	|	resume_mode=no
1615
	|	resume_mode=off
1616
	|	;;
1616
	|	;;
1617
	|    sysrq=yes|sysrq=1)
1617
	|    sysrq=yes|sysrq=1)
1618
	|	echo 1 > /proc/sys/kernel/sysrq
1618
	|	echo 1 > /proc/sys/kernel/sysrq
Lines 2148-2153 Link Here
2148
	EOF
2148
	EOF
2149
    fi
2149
    fi
2150
2150
2151
    if [ -n "$need_raidautorun" ]; then
2152
	features=(${features[@]} raidautorun)
2153
	cat_linuxrc <<-EOF
2154
	|if [ -f /sys/module/md_mod/parameters/start_ro ]; then
2155
	|    # safe to start raid before resume
2156
	|    echo 1 > /sys/module/md_mod/parameters/start_ro
2157
	|    echo "raidautorun ..."
2158
	|    raidautorun
2159
	|    echo "done..."
2160
	|else
2161
	|    case $resume_mode:$resumedev in
2162
	|        1:/dev/md* ) resume_mode=
2163
	|                     echo "Cannot resume from $resume_dev - ignoring"
2164
	|    esac
2165
	|fi
2166
	EOF
2167
    fi
2168
2151
    if [ -n "$use_udev" ] ; then
2169
    if [ -n "$use_udev" ] ; then
2152
	cat_linuxrc <<-'EOF'
2170
	cat_linuxrc <<-'EOF'
2153
	|# Waiting for a device to appear
2171
	|# Waiting for a device to appear
Lines 2324-2332 Link Here
2324
    if [ -n "$need_raidautorun" ]; then
2342
    if [ -n "$need_raidautorun" ]; then
2325
	features=(${features[@]} raidautorun)
2343
	features=(${features[@]} raidautorun)
2326
	cat_linuxrc <<-EOF
2344
	cat_linuxrc <<-EOF
2327
	|echo "raidautorun ..."
2345
	|if [ -f /sys/module/md_mod/parameters/start_ro ]; then
2328
	|raidautorun
2346
	|    # maybe should switch all arrays to rw/ but not really necessary
2329
	|echo "done..."
2347
	|    echo 0 > /sys/module/md_mod/parameters/start_ro
2348
	|else
2349
	|    echo "raidautorun ..."
2350
	|    raidautorun
2351
	|    echo "done..."
2352
	|fi
2330
	EOF
2353
	EOF
2331
    fi
2354
    fi
2332
2355

Return to bug 130693