--- wikisrc/amazon_ec2.mdwn	2011/02/19 16:13:13	1.24
+++ wikisrc/amazon_ec2.mdwn	2011/02/23 21:44:38	1.31
@@ -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
-./build.sh -O ../obj -T ../tools -D ../dest -R ../release -U install=/mnt/ec2
+su root -c ./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 +116,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 +127,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 +198,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 755 etc/rc.d/ec2_init
 fi
 """]]
 
@@ -375,7 +377,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 ***