<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,7 +1,16 @@
-images: grub.img cleese.img
+# note: this will deliberately fail to make without an empty-disk because
+# you need to do 'make empty-disk' then manually setup grub on it before
+# running 'make'
+
+all: cleese.img
+
+.PHONY: empty-disk clean clobber
+
+clobber: clean
+	-rm -f grub.img empty.img
 
 clean:
-	-rm -f grub.img cleese.img
+	-rm -f cleese.img
 	$(MAKE) -C hello_world clean
 	$(MAKE) -C echo clean
 
@@ -14,19 +23,17 @@ hello_world/KERNEL.BIN:
 echo/KERNEL.BIN:
 	$(MAKE) -C echo
 
-cleese.img: hello_world/KERNEL.BIN echo/KERNEL.BIN
-	hdiutil create -size 5M -fs &quot;MS-DOS&quot; -layout NONE cleese
-	mv cleese.dmg cleese.img
+empty-disk:
+	hdiutil create -size 5M -fs &quot;MS-DOS&quot; -layout NONE empty
+	mv empty.dmg empty.img
 	mkdir -p mnt
-	mount_msdos -o nosync `hdid -nomount cleese.img` ./mnt
-	cp -r boot ./mnt # @@@ is this even needed?
-	cp menu.lst ./mnt/boot/grub
-	cp hello_world/KERNEL.BIN ./mnt/hello_world.bin 
-	cp echo/KERNEL.BIN ./mnt/echo.bin
+	mount_msdos -o nosync `hdid -nomount empty.img` ./mnt
+	cp -r boot ./mnt
 	umount -f ./mnt
 	rm -r ./mnt
 
-update-image:
+cleese.img: empty.img hello_world/KERNEL.BIN echo/KERNEL.BIN menu.lst
+	cp empty.img cleese.img
 	mkdir -p mnt
 	mount_msdos -o nosync `hdid -nomount cleese.img` ./mnt
 	cp menu.lst ./mnt/boot/grub</diff>
      <filename>Makefile</filename>
    </modified>
    <modified>
      <diff>@@ -1,13 +1,12 @@
 
 After you have built the custom toolchain for i386-elf, run
 
-(cd hello_world; make)
-(cd echo; make)
-make images
+make grub.img
+make empty-disk
 
 In VirtualBox, create an other/unknown VM (no harddrive)
 
-Add both grub.img and cleese.img as floppies in Virtual Media Manager.
+Add both grub.img and empty.img as floppies in Virtual Media Manager.
 
 Mount grub.img as floppy and boot.
 
@@ -15,8 +14,13 @@ Once you have the prompt ready change the floppy to cleese.img. Then type in
 the shell:
 
     setup (fd0)
-    reboot
+
+Then run
+
+	make
+
+which will build the various kernels and create cleese.img.
 
 From that point on, just booting cleese.img floppy will work.
 
-If you rebuilt any kernels, run make update-image to update cleese.img
+If you rebuilt any kernels, run make update cleese.img</diff>
      <filename>SETTING_UP_DISKS</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>b3e712bdef2aec57378cfc767f7c927f94151a75</id>
    </parent>
  </parents>
  <author>
    <name>James Tauber</name>
    <email>jtauber@jtauber.com</email>
  </author>
  <url>http://github.com/jtauber/cleese/commit/15296e19b00cfe252c9b41cd3cafe5b5461389b9</url>
  <id>15296e19b00cfe252c9b41cd3cafe5b5461389b9</id>
  <committed-date>2009-10-10T23:01:42-07:00</committed-date>
  <authored-date>2009-10-10T23:01:42-07:00</authored-date>
  <message>changed creation of empty disk to be new phony target to avoid accidently blowing it away on make</message>
  <tree>f28d247b31026a31e0046ae2ee036f0113cc62d0</tree>
  <committer>
    <name>James Tauber</name>
    <email>jtauber@jtauber.com</email>
  </committer>
</commit>
