From fbe60fa3fbc96685f6d5b8db665d88a93a476423 Mon Sep 17 00:00:00 2001 From: Alessandro -oggei- Ogier Date: Fri, 6 May 2016 14:24:58 +0200 Subject: [PATCH] adding support for debian genisoimage --- contrib/create-basic-configdrive | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/create-basic-configdrive b/contrib/create-basic-configdrive index 5f9c4a58c8..ece7849c6c 100755 --- a/contrib/create-basic-configdrive +++ b/contrib/create-basic-configdrive @@ -68,9 +68,13 @@ if [ $(id -u) -eq 0 ]; then exit 1 fi -# mkisofs tool check -if ! which mkisofs &>/dev/null; then - echo "$0: mkisofs tool is required to create image." >&2 +# mkisofs/genisoimage tool check +if which mkisofs &>/dev/null; then + mkisofs=$(which mkisofs) +elif which genisoimage &>/dev/null; then + mkisofs=$(which genisoimage) +else + echo "$0: mkisofs or genisoimage tool is required to create image." >&2 exit 1 fi @@ -171,7 +175,7 @@ CLOUD_CONFIG="${CLOUD_CONFIG//${HNAME}}" echo "$CLOUD_CONFIG" > "$CONFIG_FILE" -mkisofs -R -V config-2 -o "$CONFIGDRIVE_FILE" "$WORKDIR" +$mkisofs -R -V config-2 -o "$CONFIGDRIVE_FILE" "$WORKDIR" if [ "$?" -eq 0 ] ; then echo