From b5f32620da5f7675bca5ad61a4114e075dbd19704b98f53960ef705618d93053 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 9 Sep 2013 03:08:27 +0000 Subject: [PATCH] - 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 --- mdadm.changes | 8 ++++++++ mkinitrd-boot.sh | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index b02bec1..39532cf 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -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 diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 255ea0d..d8f4736 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -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