Attachment 55991 Details for Bug 130693

[patch] Diff to mkinitrd to work with preceding kernel patch

mkinitrd.diff (text/plain), 1.37 KB, created by Neil Brown on 2005-10-31 04:27:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Brown

Created: 2005-10-31 04:27:35 UTC

Size: 1.37 KB

patch

obsolete

>--- mkinitrd.orig	2005-10-31 14:45:20.000000000 +1100
>+++ mkinitrd	2005-10-31 15:11:46.000000000 +1100
>@@ -1612,7 +1612,7 @@
> 	|	debug_linuxrc=1
> 	|	;;
> 	|    noresume)
>-	|	resume_mode=no
>+	|	resume_mode=off
> 	|	;;
> 	|    sysrq=yes|sysrq=1)
> 	|	echo 1 > /proc/sys/kernel/sysrq
>@@ -2148,6 +2148,24 @@
> 	EOF
>     fi
> 
>+    if [ -n "$need_raidautorun" ]; then
>+	features=(${features[@]} raidautorun)
>+	cat_linuxrc <<-EOF
>+	|if [ -f /sys/module/md_mod/parameters/start_ro ]; then
>+	|    # safe to start raid before resume
>+	|    echo 1 > /sys/module/md_mod/parameters/start_ro
>+	|    echo "raidautorun ..."
>+	|    raidautorun
>+	|    echo "done..."
>+	|else
>+	|    case $resume_mode:$resumedev in
>+	|        1:/dev/md* ) resume_mode=
>+	|                     echo "Cannot resume from $resume_dev - ignoring"
>+	|    esac
>+	|fi
>+	EOF
>+    fi
>+
>     if [ -n "$use_udev" ] ; then
> 	cat_linuxrc <<-'EOF'
> 	|# Waiting for a device to appear
>@@ -2324,9 +2342,14 @@
>     if [ -n "$need_raidautorun" ]; then
> 	features=(${features[@]} raidautorun)
> 	cat_linuxrc <<-EOF
>-	|echo "raidautorun ..."
>-	|raidautorun
>-	|echo "done..."
>+	|if [ -f /sys/module/md_mod/parameters/start_ro ]; then
>+	|    # maybe should switch all arrays to rw/ but not really necessary
>+	|    echo 0 > /sys/module/md_mod/parameters/start_ro
>+	|else
>+	|    echo "raidautorun ..."
>+	|    raidautorun
>+	|    echo "done..."
>+	|fi
> 	EOF
>     fi
>

Actions: View | Diff

Attachments on bug 130693: 55486 | 55487 | 55644 | 55990 | 55991