--- trunk/doc/guestoses.html	2007/10/08 16:18:51	14
+++ trunk/doc/guestoses.html	2007/10/08 16:19:01	16
@@ -10,7 +10,7 @@
 
 <!--
 
-$Id: guestoses.html,v 1.91 2005/10/07 15:44:03 debug Exp $
+$Id: guestoses.html,v 1.93 2005/10/11 03:31:26 debug Exp $
 
 Copyright (C) 2003-2005  Anders Gavare.  All rights reserved.
 
@@ -767,7 +767,7 @@
 </pre>
   <p>
   <li>Start the installation like this:<pre>
-	<b>gxemul -X -E cats -d nbsd_cats.img -d catscd.iso netbsd.aout-INSTALL.gz</b>
+	<b>gxemul -XEcats -d nbsd_cats.img -d catscd.iso netbsd.aout-INSTALL.gz</b>
 
 </pre>
 	and proceed like you would do if you were installing NetBSD on a real
@@ -775,14 +775,13 @@
 	CDROM device to install from.)
 </ol>
 
-<p>
-If everything worked, NetBSD should now be installed on the disk image.
+<p>If everything worked, NetBSD should now be installed on the disk image.
 Use the following command line to boot the emulated CATS machine:<pre>
-	<b>gxemul -X -E cats -d nbsd_cats.img netbsd.aout-GENERIC.gz</b>
+	<b>gxemul -XEcats -d nbsd_cats.img netbsd.aout-GENERIC.gz</b>
 
 </pre>
 
-
+<p>When asked for root device, enter <tt>wd0</tt>.
 
 
 
@@ -1019,6 +1018,8 @@
 </pre>
   <li>Download the entire cats directory from the ftp server:<pre>
 	<b>wget -np -l 0 -r <a href="ftp://ftp.openbsd.org/pub/OpenBSD/3.7/cats/">ftp://ftp.openbsd.org/pub/OpenBSD/3.7/cats/</a></b>
+	<b>cp ftp.openbsd.org/pub/OpenBSD/3.7/arc/bsd .</b>
+	<b>cp ftp.openbsd.org/pub/OpenBSD/3.7/arc/bsd.rd .</b>
 
 </pre>
 
@@ -1030,42 +1031,27 @@
 
 </pre>
   <li>Start the emulator using this command line:<pre>
-	<b>gxemul -X -E cats -d obsd_cats.img -d openbsd_cats_3.7.iso  \
-	    ftp.openbsd.org/pub/OpenBSD/3.7/cats/bsd.rd</b>
+	<b>gxemul -XEcats -d obsd_cats.img -d openbsd_cats_3.7.iso bsd.rd</b>
 
 </pre>
 	and proceed like you would do if you were installing OpenBSD
-	on a real CATS. (Install onto wd0, don't configure the network,
-	choose to install distribution sets from <i>disk</i> wd1 (i.e.
-	not CDROM) partition a, path '/'.)
+	on a real CATS. (Install onto <tt>wd0</tt>, don't configure the
+	network, choose to install distribution sets from <i>disk</i>
+	<tt>wd1</tt> (i.e. not CDROM) partition '<tt>a</tt>',
+	relative path '<tt>/</tt>'.)
 </ol>
 
-<p><b>NOTE (<font color="#f00000">2005-10-07</font>):</b> The ARM
-emulation mode is very new, I haven't had time to find and fix all bugs
-yet. During install, it seems that the MAKEDEV script dumps core. Before
-you can boot OpenBSD/cats for the first time, you need to manually run the
-MAKEDEV script: <pre>
-	<b>gxemul -X -E cats -d obsd_cats.img ftp.openbsd.org/pub/OpenBSD/3.7/arc/bsd</b>
-	(press s, for Shell)
-	mount /dev/wd0a /mnt; cd mnt/dev
-	sh MAKEDEV all
-	sh MAKEDEV wd
-	cd /; umount mnt; halt
-</pre>
-Hopefully this isn't a serious bug.
+<p><b>NOTE:</b> Make sure that you <tt>sync</tt> and <tt>reboot</tt>
+correctly once the installation is finished, or the <tt>/dev</tt> nodes 
+may not have been written correctly to disk.
 
-<p>
-Once the install has finished, the following command should let you 
+<p>Once the install has finished, the following command should let you 
 boot from the harddisk image:
-<p>
-<pre>
-	<b>gxemul -X -E cats -d obsd_cats.img ftp.openbsd.org/pub/OpenBSD/3.7/arc/bsd</b>
-
-</pre>
-
-<p>When asked about which drive to boot from, enter <tt>wd0</tt>.
 
+<p><pre>
+	<b>gxemul -XEcats -d obsd_cats.img bsd</b>
 
+</pre>