From 1064bc8b4ff804bffb04eff99a5866b7040ac349a18408897ae55a80a342f920 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 1 Jun 2010 22:01:48 +0000 Subject: [PATCH] Accepting request 40951 from home:michal-m:branches:Base:System Copy from home:michal-m:branches:Base:System/mdadm via accept of submit request 40951 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40951 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=20 --- mdadm.changes | 5 +++++ mkinitrd-setup.sh | 4 +++- ready | 0 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ready diff --git a/mdadm.changes b/mdadm.changes index 8922746..c6cf9b6 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 1 15:09:53 CEST 2010 - mmarek@suse.cz + +- mkinitrd-setup.sh: Fix for empty $md_devs variable. + ------------------------------------------------------------------- Wed Mar 24 17:37:27 CET 2010 - mmarek@suse.cz diff --git a/mkinitrd-setup.sh b/mkinitrd-setup.sh index e46c257..06d43c5 100644 --- a/mkinitrd-setup.sh +++ b/mkinitrd-setup.sh @@ -90,7 +90,9 @@ fi # Remember which arrays are needed for the root or swap device and assemble # them all during boot. The root= or resume= option might not directly refer to # the array. -md_devs=$(printf '/dev/%s ' $md_devs) +if test -n "$md_devs"; then + md_devs=$(printf '/dev/%s ' $md_devs) +fi save_var need_mdadm save_var md_devs diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4