From d01a7e01ed75bcb5b00916a662960ebfcc90fb3e Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Fri, 19 Nov 2010 17:17:45 +0000
Subject: [PATCH] Revert mistaken committed change.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39517 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/ImageRules | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 012f4fba59..4e835ff1c7 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1397,19 +1397,20 @@ rule BuildFloppyBootImage image : haikuLoader : archive
 
 actions BuildFloppyBootImage1
 {
-	# haiku_loader_size=`stat -c %s $(>[1])`
-	# archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
-	# if [ $haiku_loader_size -gt $archive_image_offset ] ; then
-	# 	echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
-	# 	echo "       before the boot archive starting at $archive_image_offset!"
-	# 	exit 1
-	# fi
+	haiku_loader_size=`stat -c %s $(>[1])`
+	archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
+	if [ $haiku_loader_size -gt $archive_image_offset ] ; then
+		echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
+		echo "       before the boot archive starting at $archive_image_offset!"
+		exit 1
+	fi
 	$(RM) $(<)
 	# make an empty image
 	dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
-	# add haiku_loader, then the boot drivers tgz archive
-	echo "cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc"
-	cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc
+	# add haiku_loader
+	dd if=$(>[1]) of=$(<) conv=notrunc
+	# add the boot drivers tgz archive
+	dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
 }
 
 actions BuildFloppyBootImageFixupM68K