- 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
This commit is contained in:
Neil Brown 2011-03-01 22:16:38 +00:00 committed by Git OBS Bridge
parent 03f5bbac1e
commit c57ca65b0c
2 changed files with 12 additions and 3 deletions

View File

@ -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 Thu Feb 17 00:27:02 UTC 2011 - nfbrown@novell.com

View File

@ -121,11 +121,12 @@ md_assemble()
else else
dev=$(get_md_name "$uuid") dev=$(get_md_name "$uuid")
if test -z "$dev"; then if test -z "$dev"; then
# fallback # mdadm will pick a device name
dev=/dev/md0 $mdadm -A $mdconf --uuid=$uuid
fi else
$mdadm -A $mdconf --uuid=$uuid "$dev" $mdadm -A $mdconf --uuid=$uuid "$dev"
fi fi
fi
} }
md_assemble "$resumedev" md_assemble "$resumedev"