--- wikisrc/amazon_ec2.mdwn	2011/02/23 21:44:38	1.31
+++ wikisrc/amazon_ec2.mdwn	2011/03/13 00:28:35	1.44
@@ -79,7 +79,7 @@ AKI, or *Amazon Kernel Image*, are a spe
 
 # Using pre-made AMIs
 
-XXX TODO
+[[!inline pages="amazon_ec2/AMIs"]]
 
 # Build-up your NetBSD system
 
@@ -104,7 +104,7 @@ cd src
 ./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
-su root -c ./build.sh -O ../obj -T ../tools -D ../dest -R ../release -U -V INSTALLSETS="base etc" 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
@@ -176,7 +176,6 @@ ec2_init()
         )
 }
 
-
 load_rc_config $name
 run_rc_command "$1"
 """]]
@@ -199,14 +198,14 @@ 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
+    chmod 555 etc/rc.d/ec2_init
 fi
 """]]
 
 You can then proceed to modifying the system living under */mnt/ec2*, so it can fit your needs (adding custom binaries, packages, etc). When done, build the *NetBSD-AMI.img.gz* ffs image, via [[!template id=man name=makefs section=8]], or **nbmakefs**, from the [toolchain](http://www.netbsd.org/docs/guide/en/chap-build.html#chap-build-tools):
 
 [[!template id=programlisting text="""
-$ makefs -t ffs -B le -s 256m -N /mnt/ec2/etc/ -o density=32k NetBSD-AMI.img /mnt/ec2/ 
+$ makefs -t ffs -B le -s 256m -N /mnt/ec2/etc/ -o density=32k /tmp/NetBSD-AMI.img /mnt/ec2/ 
 Calculated size of `NetBSD-AMI.img': 268435456 bytes, 7345 inodes
 Extent size set to 8192
 NetBSD-AMI.img: 256.0MB (524288 sectors) block size 8192, fragment size 1024
@@ -278,7 +277,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
 """]]