Attachment 550422 Details for Bug 832501

[patch] patch for /var/mkinitrd/scripts/, maybe not src files

mkinitrd-openSUSE12.3-peter4.4.patch (text/plain), 4.86 KB, created by Forgotten User VB1HhTwhLY on 2013-07-31 10:56:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User VB1HhTwhLY

Created: 2013-07-31 10:56:21 UTC

Size: 4.86 KB

patch

obsolete

>diff -ur mkinitrd.orig/scripts/boot-md.sh mkinitrd.peter4.4/scripts/boot-md.sh
>--- mkinitrd.orig/scripts/boot-md.sh	2013-06-19 10:09:44.000000000 +0200
>+++ mkinitrd.peter4.4/scripts/boot-md.sh	2013-07-31 11:58:13.693574043 +0200
>@@ -15,6 +15,12 @@
> ## need_mdadm=1		use MD raid
> ## 
> 
>+debug() {
>+    if [ "$DEBUG" = 1 ]; then
>+        echo "DEBUG: $@"
>+    fi
>+}
>+
> # load the necessary module before we initialize the raid system
> load_modules
> 
>@@ -67,8 +73,10 @@
> md_assemble()
> {
> 	local dev=$1 uuid mdconf container container_name
>+	debug "md_assemble $dev"
> 
> 	if test -e "$dev"; then
>+		debug "$dev exists; returning"
> 		return
> 	fi
> 	case "$dev" in
>@@ -83,6 +91,7 @@
> 		dev=
> 		;;
> 	*)
>+		debug "unhandled device $dev; returning"
> 		return
> 	esac
> 	if test -f /etc/mdadm.conf; then
>@@ -98,6 +107,7 @@
> 	else
> 		mdconf="-c partitions"
> 	fi
>+# 2013-07-30 pm: added --run to 2 lines here:
> 	case "$container" in
> 	"")
> 		;;
>@@ -114,6 +124,7 @@
> 	*)
> 		echo "unrecognized container for $dev: $container"
> 	esac
>+# 2013-07-30 pm: added --run to 3 lines here:
> 	if test -n "$dev"; then
> 		$mdadm -A $mdconf "$dev" --offroot
> 	else
>diff -ur mkinitrd.orig/scripts/setup-md.sh mkinitrd.peter4.4/scripts/setup-md.sh
>--- mkinitrd.orig/scripts/setup-md.sh	2013-06-19 10:09:43.000000000 +0200
>+++ mkinitrd.peter4.4/scripts/setup-md.sh	2013-07-31 12:20:09.125596085 +0200
>@@ -11,30 +11,47 @@
> cont_list=
> md_devs=
> 
>+# peter added this so /boot will start degraded
>+# this removes duplicates
>+# if root is mdadm+lvm, then there would be 2 roots here, one from setup-storage checking mdadm.conf, and one from another script that finds the md device that an LV root is on)
>+blockdev=$(echo "$blockdev" | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
>+
>+verbose "[MD]\t start setup-md.sh blockdev = $blockdev"
>+
> declare -A md_conf
> # blockdev contains real devices (/dev/X) for root, resume, journal, dumb
> for bd in $blockdev ; do
>     is_part_dev=false
>     case $bd in
> 	/dev/md[0-9]*p[0-9]*)
>+	    verbose "[MD]\t $bd is partitionable"
> 	    # Partitionable MD RAID. This is partition on RAID. Get the RAID
> 	    bd=${bd%%p[0-9]*}
> 	    is_part_dev=true
> 	    ;;
> 	/dev/md[0-9]*)
>+	    verbose "[MD]\t $bd is normal"
>+	    ;;
>+	/dev/md/[0-9]*)
>+	    verbose "[MD]\t $bd has slash"
> 	    ;;
> 	*)
>+	    verbose "[MD]\t $bd is other type"
> 	    mdblockdev="$mdblockdev $bd"
> 	    continue
> 	    ;;
>     esac
>     # Check if this device is already added (possible for partitionable).
>     md_dev=`mdadm -D --export $bd | sed -n -e 's/^MD_DEVNAME=//p'`
>+    verbose "[MD]\t bd = $bd md_dev = $md_dev"
>     if [ -z "$md_dev" ]; then
>         md_dev=${bd##/dev/}
>     else
>-	bd="/dev/md/$md_dev"
>+# peter changed this from bd="/dev/..." to md_dev="...", because otherwise the md_devs="..." line later won't use the bd set here, only md_dev which was wrong (0 instead of md0 or md/0), ending up with /dev/0
>+#	bd="/dev/md/$md_dev"
>+	md_dev="md/$md_dev"
>     fi
>+    verbose "[MD]\t bd = $bd md_dev = $md_dev"
>     dup_found=false
>     for dup in $md_devs; do
> 	if [ x"$dup" = x"$md_dev" ]; then
>@@ -55,6 +72,7 @@
>     fi
>     md_tmpblockdev=$(mdadm -Dbv $bd | sed -n "1D;s/,/ /g;s/^ *devices=//p")
>     mdblockdev="$mdblockdev $md_tmpblockdev"
>+    verbose "[MD]\t final bd = $bd md_dev = $md_dev"
>     md_devs="$md_devs $md_dev"
>     container=$(echo "$mdconf" | sed -rn 's/.* container=([^ ]*) .*/\1/p')
>     for cnt in $cont_list; do
>@@ -102,5 +120,6 @@
>     md_devs=$(printf '/dev/%s ' $md_devs)
> fi
> 
>+echo "md devices:     $md_devs"
> save_var need_mdadm
> save_var md_devs
>diff -ur mkinitrd.orig/scripts/setup-storage.sh mkinitrd.peter4.4/scripts/setup-storage.sh
>--- mkinitrd.orig/scripts/setup-storage.sh	2012-12-17 17:11:40.000000000 +0100
>+++ mkinitrd.peter4.4/scripts/setup-storage.sh	2013-07-31 12:46:32.265623463 +0200
>@@ -4,6 +4,9 @@
> #%param_j: "Journal device" device journaldev
> #
> # usage: update_list <id> <list>
>+
>+set &> /root/setfrommkinitrd
>+
> update_list() {
>     local elem=$1
> 
>@@ -414,3 +417,21 @@
> save_var dumpdev
> blockdev="$(resolve_device Root $rootdev) $(resolve_device /usr $usrdev) $(resolve_device Resume $resumedev) $(resolve_device Journal $journaldev) $(resolve_device Dump $dumpdev)"
> 
>+# peter added this so /boot will start degraded (this adds all devices in /etc/mdadm.conf):
>+if [ -e /etc/sysconfig/mdadm ]; then
>+    . <(grep MDADM_CONFIG /etc/sysconfig/mdadm)
>+fi
>+if [ -z "$MDADM_CONFIG" ]; then
>+    MDADM_CONFIG=/etc/mdadm.conf
>+fi
>+if [ ! -e "$MDADM_CONFIG" ]; then
>+    # only print the warning and run mdadm -D --scan if there are any md devices found
>+    if find /sys/devices/virtual/block/ -name "md" &>/dev/null; then
>+        echo "WARNING: mdadm config file \"$MDADM_CONFIG\" was not found; auto-generating it for you"
>+        blockdev="$blockdev $(mdadm -D --scan | grep ARRAY | cut -d' ' -f2)"
>+    fi
>+else
>+    blockdev="$blockdev $(grep ARRAY "$MDADM_CONFIG" | cut -d' ' -f2)"
>+fi
>+
>+verbose "[STORAGE]\t blockdev = $blockdev"

Actions: View | Diff

Attachments on bug 832501: 550422 | 569482 | 569764 | 610152 | 610281 | 626448