From c57ca65b0c3c254d492598288974997f64999b4b2fdf7d6df48b465b30f6aeb7 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 1 Mar 2011 22:16:38 +0000 Subject: [PATCH] - 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 }