From: Stefan Hajnoczi <stefanha@gmail.com>
Date: Wed, 14 Oct 2009 07:11:04 +0000 (+0100)
Subject: [util] Make mtools check detect new versions
X-Git-Tag: v0.9.9~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ea6e5c221a463ef5d62e00703e0d5595cc4d169;p=thirdparty%2Fipxe.git

[util] Make mtools check detect new versions

The mtools version check does not handle GNU mtools 4.0.10.  This commit
makes the pattern more general so it matches older mtools as well as the
newer "mtools (GNU mtools) 4.0.10" string.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
---

diff --git a/src/util/genliso b/src/util/genliso
index aa5178521..1f1c1168b 100755
--- a/src/util/genliso
+++ b/src/util/genliso
@@ -15,7 +15,7 @@ case $# in
 esac
 
 case "`mtools -V`" in
-Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*)
+Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|[mM]tools\ *\ [4-9].*)
 	;;
 *)
 	echo Mtools version 3.9.9 or later is required
diff --git a/src/util/gensdsk b/src/util/gensdsk
index 787dfa25a..a8661586f 100644
--- a/src/util/gensdsk
+++ b/src/util/gensdsk
@@ -15,7 +15,7 @@ case $# in
 	;;
 esac
 case "`mtools -V`" in
-Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*)
+Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|[mM]tools\ *\ [4-9].*)
 	;;
 *)
 	echo Mtools version 3.9.9 or later is required