X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FBootFloppy%2FMakeDiskImage;h=60e44bf17b44f07ff4436aea988a91343bd32723;hb=07e446727e54a17327b53928ce8582ba10eec619;hp=4412afb409350a16e2925961f580a0cd3b4e2fb9;hpb=78736c7e6cfcc0c97b24f863eb92478f692003ac;p=tpg%2Facess2.git

diff --git a/Tools/BootFloppy/MakeDiskImage b/Tools/BootFloppy/MakeDiskImage
index 4412afb4..60e44bf1 100755
--- a/Tools/BootFloppy/MakeDiskImage
+++ b/Tools/BootFloppy/MakeDiskImage
@@ -3,12 +3,18 @@ if [[ $# -ne 1 ]]; then
 	echo "Usage: $0 <image>" >&2
 	exit 1
 fi
+DIR=`dirname $0`
 IMGNAME=$1
+# Create and format floppy image
 dd if=/dev/zero of="$IMGNAME" bs=512 count=2880
 mformat -i "$IMGNAME" ::/ -f 1440 -v Acess
-dd if=stage1 bs=1 seek=0 count=3 "of=$IMGNAME" conv=notrunc
-dd if=stage1 bs=1 skip=$((0x3E)) seek=$((0x3E)) "of=$IMGNAME" conv=notrunc
+# Copy grub's stage1 (ignoring the FAT area)
+dd if=$DIR/stage1 bs=1 seek=0 count=3 "of=$IMGNAME" conv=notrunc
+dd if=$DIR/stage1 bs=1 skip=$((0x3E)) seek=$((0x3E)) "of=$IMGNAME" conv=notrunc
+# Copy grub images to ::/boot
 mmd -i "$IMGNAME" ::/boot
-mcopy stage1 stage2 -i "$IMGNAME" ::/boot/
+mcopy $DIR/stage1 $DIR/stage2 -i "$IMGNAME" ::/boot/
+# Patch stage2 location
 /bin/echo -ne '\x23' | dd seek=$((0x44)) bs=1 count=1 "of=$IMGNAME" conv=notrunc
-mcopy menu.lst -i "$IMGNAME" ::/boot/
+# Copy grub config file
+mcopy $DIR/menu.lst -i "$IMGNAME" ::/boot/