[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 aa517852192915deb82e21f1525eea9ee86ef103..1f1c1168bb3650980d3e27105b78591542d93058 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 787dfa25a8e9b6ca7bf8bfdd6cbd66e573a666c5..a8661586f7c9e9e3e02dfc3ce5a5e5a847243e9e 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