--- wikisrc/amazon_ec2/amis.mdwn	2013/09/29 23:17:48	1.34
+++ wikisrc/amazon_ec2/amis.mdwn	2015/11/22 01:18:54	1.48
@@ -4,6 +4,12 @@ The following AMIs are publicly availabl
 
 They come with [src](http://www.netbsd.org/docs/guide/en/chap-fetch.html) and [pkgsrc](http://www.netbsd.org/docs/pkgsrc/) bundled under */usr/src/* and */usr/pkgsrc/* respectively, or a bootstrap script to help fetch them when necessary.  The bootstrap script can also be used to set up binary packages support using pkgin(1).
 
+Starting with the NetBSD 7.0 AMIs, the images have a very small disk
+by default.  If you launch it with a larger disk, it will resize the
+root file system on initial boot, expanding it to the full size of
+your primary disk.  The 6.x AMIs default to a 5GB root file system,
+and do not currently auto-expand.
+
 Note: these AMIs send an email to the maintainer on first launch, to
 help gauge usage.  
 
@@ -17,6 +23,7 @@ The following AMIs are for 64 bit instan
   <th>us-east-1<br />(Virginia)</th>
   <th>us-west-1<br />(N. California)</th>
   <th>us-west-2<br />(Oregon)</th>
+  <th>eu-central-1<br />(Frankfurt)</th>
   <th>eu-west-1<br />(Ireland)</th>
   <th>ap-southeast-1<br />(Singapore)</th>
   <th>ap-southeast-2<br />(Sydney)</th>
@@ -24,125 +31,40 @@ The following AMIs are for 64 bit instan
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.2</th><!-- Version -->
-  <td>ami-98904bf1</td><!-- us-east-1 -->
-  <td>ami-6d267d28</td><!-- us-west-1 -->
-  <td>ami-04f37f34</td><!-- us-west-2 -->
-  <td>ami-e93d069d</td><!-- eu-west-1 -->
-  <td>ami-caa9ee98</td><!-- ap-southeast-1 -->
-  <td>-</td><!-- ap-southeast-2 -->
-  <td>ami-10e25211</td><!-- ap-northeast-1 -->
-  <td>ami-5ca17f41</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.1.3</th>
-  <td>ami-bff4a0d6</td><!-- us-east-1 -->
-  <td>ami-fe3b0fbb</td><!-- us-west-1 -->
-  <td>ami-40f26c70</td><!-- us-west-2 -->
-  <td>ami-a619fed1</td><!-- eu-west-1 -->
-  <td>ami-86145ed4</td><!-- ap-southeast-1 -->
-  <td>ami-a96df093</td><!-- ap-southeast-2 -->
-  <td>ami-ff8917fe</td><!-- ap-northeast-1 -->
-  <td>ami-2141e63c</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2</th>
-  <td>ami-097cfc60</td><!-- us-east-1 -->
-  <td>ami-7ae8c93f</td><!-- us-west-1 -->
-  <td>ami-9abb33aa</td><!-- us-west-2 -->
-  <td>ami-af171adb</td><!-- eu-west-1 -->
-  <td>ami-eec88bbc</td><!-- ap-southeast-1 -->
-  <td>ami-d155c2eb</td><!-- ap-southeast-2 -->
-  <td>ami-c4942cc5</td><!-- ap-northeast-1 -->
-  <td>ami-bca77fa1</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2.1</th>
-  <td>ami-a7f5a1ce</td><!-- us-east-1 -->
-  <td>ami-a03b0fe5</td><!-- us-west-1 -->
-  <td>ami-92f26ca2</td><!-- us-west-2 -->
-  <td>ami-5418ff23</td><!-- eu-west-1 -->
-  <td>ami-66155f34</td><!-- ap-southeast-1 -->
-  <td>ami-ff6df0c5</td><!-- ap-southeast-2 -->
-  <td>ami-8b86188a</td><!-- ap-northeast-1 -->
-  <td>ami-4f41e652</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0</th>
-  <td>ami-1400bf7d</td><!-- us-east-1 -->
-  <td>ami-9bac8bde</td><!-- us-west-1 -->
-  <td>ami-22d65f12</td><!-- us-west-2 -->
-  <td>ami-7fc3c30b</td><!-- eu-west-1 -->
-  <td>ami-b6c383e4</td><!-- ap-southeast-1 -->
-  <td>ami-a181169b</td><!-- ap-southeast-2 -->
-  <td>ami-7e2d927f</td><!-- ap-northeast-1 -->
-  <td>ami-c839e0d5</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.1</th>
-  <td>ami-a754dbce</td><!-- us-east-1 -->
-  <td>ami-bc3f1ff9</td><!-- us-west-1 -->
-  <td>ami-6ced665c</td><!-- us-west-2 -->
-  <td>ami-18f0fc6c</td><!-- eu-west-1 -->
-  <td>ami-53521001</td><!-- ap-southeast-1 -->
-  <td>ami-011b8c3b</td><!-- ap-southeast-2 -->
-  <td>ami-4a1ea54b</td><!-- ap-northeast-1 -->
-  <td>ami-4809d155</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.2</th>
-  <td>ami-315d3458</td><!-- us-east-1 -->
-  <td>ami-1381ae56</td><!-- us-west-1 -->
-  <td>ami-87d243b7</td><!-- us-west-2 -->
-  <td>ami-e50e1f91</td><!-- eu-west-1 -->
-  <td>ami-ee1a54bc</td><!-- ap-southeast-1 -->
-  <td>ami-</td><!-- ap-southeast-2 -->
-  <td>ami-a126a8a0</td><!-- ap-northeast-1 -->
-  <td>ami-366cb62b</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.3</th>
-  <td>ami-e7f6a28e</td><!-- us-east-1 -->
-  <td>ami-46241003</td><!-- us-west-1 -->
-  <td>ami-f4f26cc4</td><!-- us-west-2 -->
-  <td>ami-d618ffa1</td><!-- eu-west-1 -->
-  <td>ami-e58719e4</td><!-- ap-northeast-1 -->
-  <td>ami-d6155f84</td><!-- ap-southeast-1 -->
-  <td>ami-c56df0ff</td><!-- ap-southeast-2 -->
-  <td>ami-7541e668</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1</th>
-  <td>ami-8b751ce2</td><!-- us-east-1 -->
-  <td>ami-1185aa54</td><!-- us-west-1 -->
-  <td>ami-b1d24381</td><!-- us-west-2 -->
-  <td>ami-e70a1b93</td><!-- eu-west-1 -->
-  <td>ami-2a1d5378</td><!-- ap-southeast-1 -->
-  <td>ami-2136a61b</td><!-- ap-southeast-2 -->
-  <td>ami-1b3fb11a</td><!-- ap-northeast-1 -->
-  <td>ami-c66cb6db</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.1</th>
-  <td>ami-29420240</td><!-- us-east-1 -->
-  <td>ami-54795311</td><!-- us-west-1 -->
-  <td>ami-6a7be65a</td><!-- us-west-2 -->
-  <td>ami-599a822d</td><!-- eu-west-1 -->
-  <td>ami-44c28a16</td><!-- ap-southeast-1 -->
-  <td>ami-b968fa83</td><!-- ap-southeast-2 -->
-  <td>ami-65dd4e64</td><!-- ap-northeast-1 -->
-  <td>ami-1f4de902</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.2</th>
-  <td>ami-f7bbef9e</td><!-- us-east-1 -->
-  <td>ami-a43c08e1</td><!-- us-west-1 -->
-  <td>ami-26fb6516</td><!-- us-west-2 -->
-  <td>ami-7814f30f</td><!-- eu-west-1 -->
-  <td>ami-c8115b9a</td><!-- ap-southeast-1 -->
-  <td>ami-ff70edc5</td><!-- ap-southeast-2 -->
-  <td>ami-8d930d8c</td><!-- ap-northeast-1 -->
-  <td>ami-9f44e382</td><!-- sa-east-1 -->
+  <th>NetBSD 6.0.6</th>
+  <td>ami-ee229a86</td><!-- us-east-1 -->
+  <td>ami-ab5a4fee</td><!-- us-west-1 -->
+  <td>ami-43e2ae73</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-c62d81b1</td><!-- eu-west-1 -->
+  <td>ami-6e98be3c</td><!-- ap-southeast-1 -->
+  <td>ami-c3402df9</td><!-- ap-southeast-2 -->
+  <td>ami-7decda7c</td><!-- ap-northeast-1 -->
+  <td>ami-5fa61242</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.5</th>
+  <td>ami-bc2c94d4</td><!-- us-east-1 -->
+  <td>ami-415a4f04</td><!-- us-west-1 -->
+  <td>ami-6ffbb75f</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-f253ff85</td><!-- eu-west-1 -->
+  <td>ami-989bbdca</td><!-- ap-southeast-1 -->
+  <td>ami-63402d59</td><!-- ap-southeast-2 -->
+  <td>ami-51e2d450</td><!-- ap-northeast-1 -->
+  <td>ami-f1a511ec</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 7.0</th>
+  <td>ami-bc8fc8d6</td><!-- us-east-1 -->
+  <td>ami-7b0b621b</td><!-- us-west-1 -->
+  <td>ami-9c9f8ffd</td><!-- us-west-2 -->
+  <td>ami-32e6f45e</td><!-- eu-central-1 -->
+  <td>ami-ac983ddf</td><!-- eu-west-1 -->
+  <td>ami-c8ea2bab</td><!-- ap-southeast-1 -->
+  <td>ami-8a89d0e9</td><!-- ap-southeast-2 -->
+  <td>ami-d7eeccb9</td><!-- ap-northeast-1 -->
+  <td>ami-51d0553d</td><!-- sa-east-1 -->
 </tr>
 </table>
 
@@ -150,6 +72,7 @@ The following AMIs are for 64 bit instan
 
 The following AMIs are for 32-bit instances.
 
+*Note: eu-central-1 (Frankfurt) does not have instances capable of running 32-bit PV AMIs.*
 
 <table class="center">
 <tr>
@@ -164,124 +87,36 @@ The following AMIs are for 32-bit instan
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.2</th><!-- Version -->
-  <td>ami-0e71a967</td><!-- us-east-1 -->
-  <td>ami-472c7702</td><!-- us-west-1 -->
-  <td>ami-f0f27ec0</td><!-- us-west-2 -->
-  <td>ami-27477c53</td><!-- eu-west-1 -->
-  <td>ami-5c55110e</td><!-- ap-southeast-1 -->
-  <td>-</td><!-- ap-southeast-2 -->
-  <td>ami-a8fb4ba9</td><!-- ap-northeast-1 -->
-  <td>ami-e6a37dfb</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.1.3</th>
-  <td>ami-65f5a10c</td><!-- us-east-1 -->
-  <td>ami-923b0fd7</td><!-- us-west-1 -->
-  <td>ami-b4f26c84</td><!-- us-west-2 -->
-  <td>ami-6218ff15</td><!-- eu-west-1 -->
-  <td>ami-49861848</td><!-- ap-northeast-1 -->
-  <td>ami-56155f04</td><!-- ap-southeast-1 -->
-  <td>ami-836df0b9</td><!-- ap-southeast-2 -->
-  <td>ami-5541e648</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2</th><!-- Version -->
-  <td>ami-637fff0a</td><!-- us-east-1 -->
-  <td>ami-9ce8c9d9</td><!-- us-west-1 -->
-  <td>ami-70bc3440</td><!-- us-west-2 -->
-  <td>ami-a3161bd7</td><!-- eu-west-1 -->
-  <td>ami-76cf8c24</td><!-- ap-southeast-1 -->
-  <td>ami-2f54c315</td><!-- ap-southeast-2 -->
-  <td>ami-4a972f4b</td><!-- ap-northeast-1 -->
-  <td>ami-cca77fd1</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2.1</th>
-  <td>ami-75f6a21c</td><!-- us-east-1 -->
-  <td>ami-b23b0ff7</td><!-- us-west-1 -->
-  <td>ami-8af26cba</td><!-- us-west-2 -->
-  <td>ami-4c18ff3b</td><!-- eu-west-1 -->
-  <td>ami-6c155f3e</td><!-- ap-southeast-1 -->
-  <td>ami-e76df0dd</td><!-- ap-southeast-2 -->
-  <td>ami-9b87199a</td><!-- ap-northeast-1 -->
-  <td>ami-4141e65c</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0</th>
-  <td>ami-68ff4101</td><!-- us-east-1 -->
-  <td>ami-59b4931c</td><!-- us-west-1 -->
-  <td>ami-6cd65f5c</td><!-- us-west-2 -->
-  <td>ami-abd0d0df</td><!-- eu-west-1 -->
-  <td>ami-70c48422</td><!-- ap-southeast-1 -->
-  <td>ami-3f801705</td><!-- ap-southeast-2 -->
-  <td>ami-562c9357</td><!-- ap-northeast-1 -->
-  <td>ami-e639e0fb</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.1</th>
-  <td>ami-5d0f8034</td><!-- us-east-1 -->
-  <td>ami-1800205d</td><!-- us-west-1 -->
-  <td>ami-f0ed66c0</td><!-- us-west-2 -->
-  <td>ami-00f2fe74</td><!-- eu-west-1 -->
-  <td>ami-6f52103d</td><!-- ap-southeast-1 -->
-  <td>ami-6b1b8c51</td><!-- ap-southeast-2 -->
-  <td>ami-8e15ae8f</td><!-- ap-northeast-1 -->
-  <td>ami-e409d1f9</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.2</th>
-  <td>ami-995039f0</td><!-- us-east-1 -->
-  <td>ami-8b80afce</td><!-- us-west-1 -->
-  <td>ami-d5d544e5</td><!-- us-west-2 -->
-  <td>ami-cf0e1fbb</td><!-- eu-west-1 -->
-  <td>ami-i881b55da</td><!-- ap-southeast-1 -->
-  <td>ami-cd37a7f7</td><!-- ap-southeast-2 -->
-  <td>ami-9b3eb09a</td><!-- ap-northeast-1 -->
-  <td>ami-d26cb6cf</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.3</th>
-  <td>ami-aff6a2c6</td><!-- us-east-1 -->
-  <td>ami-42241007</td><!-- us-west-1 -->
-  <td>ami-e8f26cd8</td><!-- us-west-2 -->
-  <td>ami-b218ffc5</td><!-- eu-west-1 -->
-  <td>ami-e2155fb0</td><!-- ap-southeast-1 -->
-  <td>ami-216cf11b</td><!-- ap-southeast-2 -->
-  <td>ami-3d841a3c</td><!-- ap-northeast-1 -->
-  <td>ami-6b41e676</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1</th>
-  <td>ami-815138e8</td><!-- us-east-1 -->
-  <td>ami-db80af9e</td><!-- us-west-1 -->
-  <td>ami-cbd243fb</td><!-- us-west-2 -->
-  <td>ami-5d0f1e29</td><!-- eu-west-1 -->
-  <td>ami-fe1b55ac</td><!-- ap-southeast-1 -->
-  <td>ami-1337a729</td><!-- ap-southeast-2 -->
-  <td>ami-4523ad44</td><!-- ap-northeast-1 -->
-  <td>ami-2c6cb631</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.1</th>
-  <td>ami-0345056a</td><!-- us-east-1 -->
-  <td>ami-7c795339</td><!-- us-west-1 -->
-  <td>ami-127ae722</td><!-- us-west-2 -->
-  <td>ami-a79c84d3</td><!-- eu-west-1 -->
-  <td>ami-8ac28ad8</td><!-- ap-southeast-1 -->
-  <td>ami-f568facf</td><!-- ap-southeast-2 -->
-  <td>ami-2bc4572a</td><!-- ap-northeast-1 -->
-  <td>ami-5d4de940</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.2</th>
-  <td>ami-65a7f30c</td><!-- us-east-1 -->
-  <td>ami-223d0967</td><!-- us-west-1 -->
-  <td>ami-70fb6540</td><!-- us-west-2 -->
-  <td>ami-2013f457</td><!-- eu-west-1 -->
-  <td>ami-8e115bdc</td><!-- ap-southeast-1 -->
-  <td>ami-3973ee03</td><!-- ap-southeast-2 -->
-  <td>ami-d3930dd2</td><!-- ap-northeast-1 -->
-  <td>ami-c944e3d4</td><!-- sa-east-1 -->
+  <th>NetBSD 6.0.6</th>
+  <td>ami-62249c0a</td><!-- us-east-1 -->
+  <td>ami-7945503c</td><!-- us-west-1 -->
+  <td>ami-ede2aedd</td><!-- us-west-2 -->
+  <td>ami-302e8247</td><!-- eu-west-1 -->
+  <td>ami-3498be66</td><!-- ap-southeast-1 -->
+  <td>ami-1d432e27</td><!-- ap-southeast-2 -->
+  <td>ami-b7eadcb6</td><!-- ap-northeast-1 -->
+  <td>ami-73a6126e</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.5</th>
+  <td>ami-b618a0de</td><!-- us-east-1 -->
+  <td>ami-3d5a4f78</td><!-- us-west-1 -->
+  <td>ami-3be2ae0b</td><!-- us-west-2 -->
+  <td>ami-aa2c80dd</td><!-- eu-west-1 -->
+  <td>ami-5a98be08</td><!-- ap-southeast-1 -->
+  <td>ami-fd402dc7</td><!-- ap-southeast-2 -->
+  <td>ami-3befd93a</td><!-- ap-northeast-1 -->
+  <td>ami-07a6121a</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 7.0</th>
+  <td>ami-569ed93c</td><!-- us-east-1 -->
+  <td>ami-fa0e679a</td><!-- us-west-1 -->
+  <td>ami-9f8090fe</td><!-- us-west-2 -->
+  <td>ami-a460c5d7</td><!-- eu-west-1 -->
+  <td>ami-4af33229</td><!-- ap-southeast-1 -->
+  <td>ami-f98bd29a</td><!-- ap-southeast-2 -->
+  <td>ami-c5f8daab</td><!-- ap-northeast-1 -->
+  <td>ami-2bd15447</td><!-- sa-east-1 -->
 </tr>
 </table>