summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Hajnoczi2009-10-14 09:11:04 +0200
committerMarty Connor2009-10-15 20:54:30 +0200
commit0ea6e5c221a463ef5d62e00703e0d5595cc4d169 (patch)
tree38b5535bebe69582233b90d0a171730e3fb51a84
parent[modrom] Avoid clobbering near jump with checksum (diff)
downloadipxe-0ea6e5c221a463ef5d62e00703e0d5595cc4d169.tar.gz
ipxe-0ea6e5c221a463ef5d62e00703e0d5595cc4d169.tar.xz
ipxe-0ea6e5c221a463ef5d62e00703e0d5595cc4d169.zip
[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>
-rwxr-xr-xsrc/util/genliso2
-rw-r--r--src/util/gensdsk2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/util/genliso b/src/util/genliso
index aa517852..1f1c1168 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 787dfa25..a8661586 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