- mkinitd-boot.sh: Clear {root,resume}_major variable
If multipath is in use, md is always on top of it. Therefore, the root device is always an md device. (bnc#786526) OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=91
This commit is contained in:
parent
07e6883325
commit
4af8f82cac
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 03:06:20 UTC 2013 - nfbrown@suse.com
|
||||
|
||||
- mkinitd-boot.sh: Clear {root,resume}_major variable
|
||||
|
||||
If multipath is in use, md is always on top of it. Therefore, the root
|
||||
device is always an md device. (bnc#786526)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 6 04:02:41 UTC 2013 - nfbrown@suse.com
|
||||
|
||||
|
@ -66,7 +66,7 @@ get_md_name()
|
||||
|
||||
md_assemble()
|
||||
{
|
||||
local dev=$1 uuid mdconf container container_name
|
||||
local dev=$1 type=$2 uuid mdconf container container_name
|
||||
|
||||
if test -e "$dev"; then
|
||||
return
|
||||
@ -125,13 +125,17 @@ md_assemble()
|
||||
$mdadm -A $mdconf --uuid=$uuid "$dev" --offroot
|
||||
fi
|
||||
fi
|
||||
# If md and multipath are used, md is not top. Clear
|
||||
# the {root,resume}_major setting from boot-multipath.sh
|
||||
local var=${type}_major
|
||||
read $var </dev/null
|
||||
}
|
||||
|
||||
# run any degraded arrays assembled incrementally
|
||||
wait_for_events
|
||||
$mdadm --incremental --run --scan --offroot
|
||||
md_assemble "$resumedev"
|
||||
md_assemble "$rootdev"
|
||||
md_assemble "$resumedev" "resume"
|
||||
md_assemble "$rootdev" "root"
|
||||
if [ -n "$md_dev" ] ; then
|
||||
md_assemble "$md_dev"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user