From ca382b6a00f5bb3232230b5033a4039e4531a25b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 8 Jul 2009 02:39:25 +0200 Subject: [PATCH] Use ls for locating /dev/md* devices --- debian/changelog | 4 +++- grml-debootstrap | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b163b75..09ab595 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,10 @@ grml-debootstrap (0.29) UNRELEASED; urgency=low * Mention hostname in configuration check dialog. * Apply patch by Zoran Dzelajlija which addresses the partition calculation problem when installing to /dev/cciss/c0d0*. Thanks! + * Use ls for locating /dev/md* devices instead of echo so we don't + have '/dev/md*' in the interactive partition dialog. - -- Michael Prokop Wed, 08 Jul 2009 02:27:09 +0200 + -- Michael Prokop Wed, 08 Jul 2009 02:38:45 +0200 grml-debootstrap (0.28) unstable; urgency=low diff --git a/grml-debootstrap b/grml-debootstrap index 9babb26..3c55932 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -179,7 +179,7 @@ prompt_for_target() AVAILABLE_PARTITIONS=$(LANG=C fdisk -l 2>/dev/null | \ sed 's/*//' | \ grep -v 'Extended$' | \ - gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}'; echo /dev/md*); + gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}'; ls /dev/md* 2>/dev/null || true); if [ -z "$AVAILABLE_PARTITIONS" ] ; then dialog --title "$PN" --trim \ -- 2.1.4