From f5a53a63787e79a8d794605493f34d4092d5bba5 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <rasm@lsts.pt>
Date: Fri, 27 Jun 2014 22:40:56 +0100
Subject: [PATCH] mkdisk: use compiled e2fsprogs.

---
 mkdisk.bash | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/mkdisk.bash b/mkdisk.bash
index 2e43a3e..9f74c01 100755
--- a/mkdisk.bash
+++ b/mkdisk.bash
@@ -95,7 +95,7 @@ create_part_root()
         || die
 
     nfo2 "Creating filesystem"
-    mkfs.ext2 -q -L "$part_label" "$part_dev" || die
+    "$cmd_mkfs_ext2" -q -F -L "$part_label" "$part_dev" > /dev/null 2>&1 || die
 
     nfo2 "Populating filesystem"
     cmd_mount ext2 "$part_dev" || die
@@ -128,7 +128,7 @@ create_part_data()
         || die
 
     nfo2 "Creating filesystem"
-    mkfs.ext4 -q -L "$part_label" -O dir_index "$part_dev" || die
+    "$cmd_mkfs_ext4" -q -F -L "$part_label" -O dir_index "$part_dev" > /dev/null 2>&1 || die
 
     nfo2 "Populating filesystem"
     cmd_mount ext4 "$part_dev" || die
@@ -174,6 +174,20 @@ else
     cmd_mkdosfs="mkdosfs"
 fi
 
+if [ -x "$cfg_dir_toolchain/sbin/mkfs.ext2" ]; then
+    cmd_mkfs_ext2="$cfg_dir_toolchain/sbin/mkfs.ext2"
+else
+    echo "Warning: using system mkfs.ext2, this might lead to errors"
+    cmd_mkfs_ext2="mkfs.ext2"
+fi
+
+if [ -x "$cfg_dir_toolchain/sbin/mkfs.ext4" ]; then
+    cmd_mkfs_ext4="$cfg_dir_toolchain/sbin/mkfs.ext4"
+else
+    echo "Warning: using system mkfs.ext4, this might lead to errors"
+    cmd_mkfs_ext4="mkfs.ext4"
+fi
+
 source "functions.bash"
 
 dev="$2"