diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/util/genfsimg | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/util/genfsimg b/src/util/genfsimg index 419c3f801..c3123f3ed 100755 --- a/src/util/genfsimg +++ b/src/util/genfsimg @@ -268,13 +268,27 @@ fi # if [ -n "${ISOIMG}" ] ; then MKISOFS= + MKISOFS_MISSING= + MKISOFS_NOTSUP= for CMD in genisoimage mkisofs xorrisofs ; do - if "${CMD}" ${ISOARGS} --version "${ISODIR}" >/dev/null 2>&1 ; then - MKISOFS="${CMD}" - break + if ! "${CMD}" --version >/dev/null 2>&1 ; then + MKISOFS_MISSING="${MKISOFS_MISSING} ${CMD}" + continue fi + if ! "${CMD}" ${ISOARGS} --version "${ISODIR}" >/dev/null 2>&1 ; then + MKISOFS_NOTSUP="${MKISOFS_NOTSUP} ${CMD}" + continue + fi + MKISOFS="${CMD}" + break done if [ -z "${MKISOFS}" ] ; then + if [ -n "${MKISOFS_MISSING}" ] ; then + echo "${0}:${MKISOFS_MISSING}: not installed" >&2 + fi + if [ -n "${MKISOFS_NOTSUP}" ] ; then + echo "${0}:${MKISOFS_NOTSUP}: cannot handle ${ISOARGS}" >&2 + fi echo "${0}: cannot find a suitable mkisofs or equivalent" >&2 exit 1 fi |