From adf32efa6bb38796b231050316b0b6229cbf9c48 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Nov 2013 10:09:00 +0100
Subject: mkimage: check for mkfs.xxx after setting defaults.

---
 mkimage.sh.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mkimage.sh.in')

diff --git a/mkimage.sh.in b/mkimage.sh.in
index b3b8800..fe92a6e 100644
--- a/mkimage.sh.in
+++ b/mkimage.sh.in
@@ -85,12 +85,6 @@ if [ "$(id -u)" -ne 0 ]; then
     die "need root perms to continue, exiting."
 fi
 
-for f in parted mkfs.${BOOT_FSTYPE} mkfs.${ROOT_FSTYPE}; do
-    if ! which ${f} >/dev/null; then
-        die "Cannot find ${f}, exiting."
-    fi
-done
-
 IMGSIZE="$2"
 if [ -z "$IMGSIZE" ]; then
     IMGSIZE="2G"
@@ -108,6 +102,12 @@ if [ -z "$FILENAME" ]; then
     FILENAME="void-image-$(date +%Y%m%d).img"
 fi
 
+for f in parted mkfs.${BOOT_FSTYPE} mkfs.${ROOT_FSTYPE}; do
+    if ! which ${f} >/dev/null; then
+        die "Cannot find ${f}, exiting."
+    fi
+done
+
 info_msg "Creating disk image ($IMGSIZE) ..."
 dd if=/dev/zero of=$FILENAME bs=$IMGSIZE count=1 conv=sparse >/dev/null 2>&1
 
-- 
cgit 1.4.1