--- wikisrc/amazon_ec2.mdwn	2011/02/22 22:47:51	1.25
+++ wikisrc/amazon_ec2.mdwn	2011/02/25 00:35:09	1.35
@@ -79,7 +79,55 @@ AKI, or *Amazon Kernel Image*, are a spe
 
 # Using pre-made AMIs
 
-XXX TODO
+The following AMIs are publicly available. You can use them to [start a NetBSD instance](#index11h2) quickly, without needing to build your image by hand.
+
+<table>
+<tr>
+  <th>NetBSD version</th>
+  <th>us-west-1</th>
+  <th>us-east-1</th>
+  <th>eu-west-1</th>
+  <th>ap-southeast-1</th>
+</tr>
+<tr>
+  <th>NetBSD 5.1.0_PATCH</th>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong>ami-f612e19f</strong>
+  </td>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+</tr>
+<tr>
+  <th>NetBSD-HEAD (5.99.45)</th>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+  <td>
+      32 bits: <strong></strong><br/>
+      64 bits: <strong></strong>
+  </td>
+</tr>
+</table>
 
 # Build-up your NetBSD system
 
@@ -101,10 +149,10 @@ ftp -a 'http://ftp.netbsd.org/pub/NetBSD
 tar -xzpf src.tar.gz
 cd src
 # build distribution and kernel
-./build.sh -O ../obj -T ../tools -D ../dest -R ../release -V INSTALLSETS="base etc" -m amd64 -U distribution
+./build.sh -O ../obj -T ../tools -D ../dest -R ../release -m amd64 -U distribution
 ./build.sh -O ../obj -T ../tools -m amd64 kernel=XEN3_DOMU
 # install distribution in /mnt/ec2
-./build.sh -O ../obj -T ../tools -D ../dest -R ../release -U install=/mnt/ec2
+su root ./build.sh -O ../obj -T ../tools -D ../dest -R ../release -U -V INSTALLSETS="base etc" install=/mnt/ec2
 """]]
 
 # Configuration of your NetBSD EC2 tree
@@ -116,6 +164,7 @@ Under */mnt/ec2*, edit the files to add 
 [[!template id=filecontent name=etc/rc.conf text="""
 rc_configured=YES
 
+ec2_init=YES
 sshd=YES # for remote shell access to instance
 """]]
 
@@ -126,16 +175,17 @@ PermitRootLogin without-password
 
 This file is needed if you want to login via the EC2 SSH key pair created previously:
 
-[[!template id=filecontent name=etc/rc.d/ec2-init text="""
+[[!template id=filecontent name=etc/rc.d/ec2_init text="""
 #!/bin/sh
 #
-# PROVIDE: amazon-ec2
+# PROVIDE: ec2_init
 # REQUIRE: NETWORKING
 # BEFORE:  LOGIN
 
 $_rc_subr_loaded . /etc/rc.subr
 
 name="ec2_init"
+rcvar=${name}
 start_cmd="ec2_init"
 stop_cmd=":"
 
@@ -196,8 +246,8 @@ ptyfs      /dev/pts ptyfs  rw
 procfs     /proc    procfs rw
 EOF
 # EC2 startup script (if you installed it)
-if [ -f etc/rc.d/ec2-init ]; then
-    chmod 755 etc/rc.d/ec2-init
+if [ -f etc/rc.d/ec2_init ]; then
+    chmod 555 etc/rc.d/ec2_init
 fi
 """]]
 
@@ -276,7 +326,7 @@ ATTACHMENT      vol-24f88d4c    i-5babe7
 Before we can connect to our brand new instance, we have to allow connections on SSH port (22) through the AWS EC2 firewall:
 
 [[!template id=programlisting text="""
-$ ec2-authorize default -p 22
+$ ec2-authorize default -p 22 --region us-east-1
 GROUP           default 
 PERMISSION              default ALLOWS  tcp     22      22      FROM    CIDR    0.0.0.0/0
 """]]
@@ -375,7 +425,7 @@ IMAGE   <strong>ami-74d0231d</strong>
 You can now start your own NetBSD instance, via:
 
 [[!template id=programlisting text="""
-$ ec2-run-instances ami-74d0231d -t t1.micro -z us-east-1c     
+$ ec2-run-instances ami-74d0231d -t t1.micro -z us-east-1c -k $EC2_SSH_KEYNAME
 RESERVATION     r-08218465      983624114127    default
 INSTANCE        <strong>i-953d72f9</strong>      ami-74d0231d                    pending         0               t1.micro        2011-02-18T02:05:46+0000        us-east-1c      aki-4e7d9527                    monitoring-disabled
 *** Wait a few minutes, micro instances take time to start ***