From a6670eacc48688a23df97303e2d3165dc771d493 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 8 Jul 2010 23:21:16 +0200
Subject: [PATCH] e2fsprogs: use busybox's 'mkfs.ext2' and 'mke2fs' applets
 instead these from e2fsprogs

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/busybox/config/busybox.conf | 4 ++--
 packages/tools/e2fsprogs/install              | 4 ++--
 packages/tools/installer/install              | 1 +
 packages/tools/installer/scripts/installer    | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index 3a7cc58c6e..a082a3bd60 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.17.0
-# Thu Jul  8 20:37:55 2010
+# Thu Jul  8 22:15:41 2010
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -519,7 +519,7 @@ CONFIG_FINDFS=y
 CONFIG_FLOCK=y
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
+CONFIG_MKFS_EXT2=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_MKFS_REISER is not set
diff --git a/packages/tools/e2fsprogs/install b/packages/tools/e2fsprogs/install
index 0de96545ee..3bb6db3413 100755
--- a/packages/tools/e2fsprogs/install
+++ b/packages/tools/e2fsprogs/install
@@ -8,9 +8,9 @@ mkdir -p $INSTALL/etc
   cp $PKG_BUILD/misc/mke2fs.conf $INSTALL/etc
 
 mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/misc/mke2fs $INSTALL/usr/sbin
+#  cp $PKG_BUILD/misc/mke2fs $INSTALL/usr/sbin
   cp $PKG_BUILD/misc/tune2fs $INSTALL/usr/sbin
-  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/usr/sbin
+#  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/lib/*.so.[0-9] $INSTALL/usr/lib
diff --git a/packages/tools/installer/install b/packages/tools/installer/install
index bd0e639421..714db55624 100755
--- a/packages/tools/installer/install
+++ b/packages/tools/installer/install
@@ -2,6 +2,7 @@
 
 . config/options
 
+$SCRIPTS/install busybox
 $SCRIPTS/install bash
 $SCRIPTS/install bc
 $SCRIPTS/install dialog
diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer
index 30d033eb4c..8b60bb19a0 100755
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@@ -213,13 +213,15 @@ function do_install_quick() {
 
         # create filesystem
           msg_progress_install "23" "creating filesystem on ${INSTALL_DEVICE}1"
-            mke2fs -t ext3 ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
+#            mke2fs -t ext3 ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
+            mke2fs ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
 
           msg_progress_install "25" "set uuid and disklabel $DISKLABEL_SYSTEM on ${INSTALL_DEVICE}1"
             tune2fs -U random -L $DISKLABEL_SYSTEM  ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
 
           msg_progress_install "28" "creating filesystem on ${INSTALL_DEVICE}2"
-            mke2fs -t ext3 ${INSTALL_DEVICE}2 >> $LOGFILE 2>&1
+#            mke2fs ${INSTALL_DEVICE}2 >> $LOGFILE 2>&1
+            mke2fs ${INSTALL_DEVICE}2 >> $LOGFILE 2>&1
 
           msg_progress_install "30" "set uuid and disklabel $DISKLABEL_STORAGE on ${INSTALL_DEVICE}2"
             tune2fs -U random -L $DISKLABEL_STORAGE  ${INSTALL_DEVICE}2 >> $LOGFILE 2>&1