From 53f48300477ee2becf2332889ad6a366d31ff7d9 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Wed, 26 Nov 2003 00:42:40 +0000
Subject: [PATCH] improved stone_mod_install to display the size of the
 partitions

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1864 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE    |  1 +
 package/base/sysfiles/stone_mod_install.sh | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 42768dac8..f7363d2df 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -3,6 +3,7 @@
 
  - Juergen Sawinski: updated xfree86 cyrillic fonts
  - fixed (hopefully - no functionality test) webmin
+ - improved stone_mod_install to display the size of the partitions
 
 *) 2003-11-24 (2.0.0-rc3 - 2.0.0-rc4)
 
diff --git a/package/base/sysfiles/stone_mod_install.sh b/package/base/sysfiles/stone_mod_install.sh
index 56236d9d8..65483824d 100644
--- a/package/base/sysfiles/stone_mod_install.sh
+++ b/package/base/sysfiles/stone_mod_install.sh
@@ -58,15 +58,11 @@ part_mkfs() {
 	cmd="$cmd 'reiserfs (journaling filesystem)'"
 	cmd="$cmd 'mkreiserfs /dev/$1/$2'"
 
-	if type -p jfs_mkfs > /dev/null ; then
-		cmd="$cmd 'IBM JFS  (journaling filesystem)'"
-		cmd="$cmd 'jfs_mkfs /dev/$1/$2'"
-	fi
+	cmd="$cmd 'IBM JFS  (journaling filesystem)'"
+	cmd="$cmd 'jfs_mkfs /dev/$1/$2'"
 
-	if type -p mkfs.xfs > /dev/null ; then
-		cmd="$cmd 'SGI XFS  (journaling filesystem)'"
-		cmd="$cmd 'mkfs.xfs /dev/$1/$2'"
-	fi
+	cmd="$cmd 'SGI XFS  (journaling filesystem)'"
+	cmd="$cmd 'mkfs.xfs /dev/$1/$2'"
 
 	eval "$cmd" && part_mount $1 $2
 }
@@ -93,11 +89,15 @@ part_add() {
 			  sed "s,^/mnt/target,," `"
 		[ "$location" ] || location="/"
 	fi
-	type="`disktype /dev/$1/$2 | \
-		grep -v -e '^  ' -e '^Block device' -e '^Partition' -e '^---' | \
-		sed -e 's/[,(].*//' -e '/^$/d' -e 's/ $//' | tail -1`"
+	# save partition information
+	disktype /dev/$1/$2 > /tmp/stone-install
+	type="`grep /tmp/stone-install -v -e '^  ' -e '^Block device' \
+	       -e '^Partition' -e '^---' | \
+	       sed -e 's/[,(].*//' -e '/^$/d' -e 's/ $//' | tail -1`"
+	size="`grep 'Block device, size' /tmp/stone-install | \
+	       sed 's/.* size \(.*\) (.*/\1/'`"
 	[ "$type" ] || type="undetected"
-	cmd="$cmd '`printf "%-8s %-24s" $2 "$location"` ($type)' 'part_${action}_action $1 $2'"
+	cmd="$cmd '`printf "%-6s %-24s %-10s" $2 "$location" "$size"` ($type)' 'part_${action}_action $1 $2'"
 }
 
 disk_action() {