[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 aa51785..1f1c116 100755 (executable)
--- 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 787dfa2..a866158 100644 (file)
--- 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