From 6e8ec861d8ca9f0d2a0ed3c8a0415cbc9696b8877cb805ecec0dcd057051f4a0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 18 Feb 2011 11:25:57 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/mdadm revision 53.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=fe045118e6625dec94cf4c657e30dae6 --- mdadm.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index c0d8c36..0d82ab2 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ # -# spec file for package mdadm (Version 3.1.4) +# spec file for package mdadm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: mdadm Version: 3.1.4 -Release: 2 +Release: 15 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools From 1b4305f284cbb7448f6993e06b2d75ef8245b01e5668e29decc7c832c0a87476 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 1 Mar 2011 22:16:38 +0000 Subject: [PATCH 2/2] - mkinitrd-boot.sh: don't assume /dev/md when device name cannot be found. It could easily be wrong, and there is no need as mdadm will choose a device. (bnc#656536) OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=33 --- mdadm.changes | 8 ++++++++ mkinitrd-boot.sh | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index 4957460..36af9cd 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 1 22:15:23 UTC 2011 - nfbrown@novell.com + +- mkinitrd-boot.sh: don't assume /dev/md when device + name cannot be found. It could easily be wrong, + and there is no need as mdadm will choose a device. + (bnc#656536) + ------------------------------------------------------------------- Thu Feb 17 00:27:02 UTC 2011 - nfbrown@novell.com diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 01fddbd..acd141a 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -121,10 +121,11 @@ md_assemble() else dev=$(get_md_name "$uuid") if test -z "$dev"; then - # fallback - dev=/dev/md0 + # mdadm will pick a device name + $mdadm -A $mdconf --uuid=$uuid + else + $mdadm -A $mdconf --uuid=$uuid "$dev" fi - $mdadm -A $mdconf --uuid=$uuid "$dev" fi }