From 6aac64aa1c944bb2b50f23d9f40e46b5d3b42151 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Wed, 26 Nov 2003 00:49:14 +0000
Subject: [PATCH] oops - I should not cp /some-file rock-trunk/some-file when
 the installed file was not SVN:HEAD - this is a revert and rediff - sorry
 Yours tired, Rene ...

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1865 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/sysfiles/stone_mod_install.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/package/base/sysfiles/stone_mod_install.sh b/package/base/sysfiles/stone_mod_install.sh
index 65483824d..e4c4fc325 100644
--- a/package/base/sysfiles/stone_mod_install.sh
+++ b/package/base/sysfiles/stone_mod_install.sh
@@ -58,11 +58,15 @@ part_mkfs() {
 	cmd="$cmd 'reiserfs (journaling filesystem)'"
 	cmd="$cmd 'mkreiserfs /dev/$1/$2'"
 
-	cmd="$cmd 'IBM JFS  (journaling filesystem)'"
-	cmd="$cmd 'jfs_mkfs /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 'SGI XFS  (journaling filesystem)'"
-	cmd="$cmd 'mkfs.xfs /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
 
 	eval "$cmd" && part_mount $1 $2
 }
@@ -89,6 +93,7 @@ part_add() {
 			  sed "s,^/mnt/target,," `"
 		[ "$location" ] || location="/"
 	fi
+
 	# save partition information
 	disktype /dev/$1/$2 > /tmp/stone-install
 	type="`grep /tmp/stone-install -v -e '^  ' -e '^Block device' \
@@ -96,8 +101,9 @@ part_add() {
 	       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 "%-6s %-24s %-10s" $2 "$location" "$size"` ($type)' 'part_${action}_action $1 $2'"
+	cmd="$cmd '`printf "%-6s %-24s %-10s" $2 "$location" "$size"` $type' 'part_${action}_action $1 $2'"
 }
 
 disk_action() {