Fix preseed country string errors, and lie less about how long autoinstalls take

diff --git a/code/static/preseed/lucid-amd64-debathena-standard.preseed b/code/static/preseed/lucid-amd64-debathena-standard.preseed
index d48e9f3..e56cb9d 100644 (file)
--- a/code/static/preseed/lucid-amd64-debathena-standard.preseed
+++ b/code/static/preseed/lucid-amd64-debathena-standard.preseed
@@ -1,5 +1,5 @@
 # Download packages from mirrors.mit.edu
-d-i mirror/country string enter information manually
+d-i mirror/country string manual
 d-i mirror/http/countries string manual
 d-i mirror/http/hostname string mirrors.mit.edu
 d-i mirror/http/directory string /ubuntu/

diff --git a/code/static/preseed/lucid.preseed b/code/static/preseed/lucid.preseed
index c683611..02530b5 100644 (file)
--- a/code/static/preseed/lucid.preseed
+++ b/code/static/preseed/lucid.preseed
@@ -1,5 +1,5 @@
 # Download packages from mirrors.mit.edu
-d-i mirror/country string enter information manually
+d-i mirror/country string manual
 d-i mirror/http/countries string manual
 d-i mirror/http/hostname string mirrors.mit.edu
 d-i mirror/http/directory string /ubuntu/

diff --git a/code/static/preseed/maverick.preseed b/code/static/preseed/maverick.preseed
index fc581b0..9e2ea1e 100644 (file)
--- a/code/static/preseed/maverick.preseed
+++ b/code/static/preseed/maverick.preseed
@@ -1,5 +1,5 @@
 # Download packages from mirrors.mit.edu
-d-i mirror/country string enter information manually
+d-i mirror/country string manual
 d-i mirror/http/countries string manual
 d-i mirror/http/hostname string mirrors.mit.edu
 d-i mirror/http/directory string /ubuntu/

diff --git a/code/static/preseed/precise.preseed b/code/static/preseed/precise.preseed
index 9a577e1..4d1d4e9 100644 (file)
--- a/code/static/preseed/precise.preseed
+++ b/code/static/preseed/precise.preseed
@@ -1,5 +1,5 @@
 # Download packages from mirrors.mit.edu
-d-i mirror/country string enter information manually
+d-i mirror/country string manual
 d-i mirror/http/countries string manual
 d-i mirror/http/hostname string mirrors.mit.edu
 d-i mirror/http/directory string /ubuntu/

diff --git a/code/static/preseed/squeeze.preseed b/code/static/preseed/squeeze.preseed
index af8848e..e2c75df 100644 (file)
--- a/code/static/preseed/squeeze.preseed
+++ b/code/static/preseed/squeeze.preseed
@@ -2,7 +2,7 @@
 d-i keyboard-configuration/xkb-keymap string us
 
 # Download packages from mirrors.mit.edu
-d-i mirror/country string enter information manually
+d-i mirror/country string manual
 d-i mirror/http/countries string manual
 d-i mirror/http/hostname string mirrors.mit.edu
 d-i mirror/http/directory string /debian/

diff --git a/code/templates/list.mako b/code/templates/list.mako
index 777134f..ad12933 100644 (file)
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -63,7 +63,7 @@ VM List
          <td><label><input type="radio" name="cd_or_auto" id="cd_or_auto_auto"
                  onchange="$('cdromlist').value = ''; $('vmtype-linux').checked = true" />
 ${self.fn.autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")}
-             (experimental; 2-3 minutes, and you have a machine with empty root password.)
+             (experimental; 15-20 minutes, and you have a machine with empty root password.)
 </label></td>
        </tr>
        <tr>

diff --git a/debian/changelog b/debian/changelog
index 0f7e406..4dba5bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-web (0.1.52) unstable; urgency=low
+
+  * preseeds: Correct country string error; fixes mirror selection
+  * VM creation form: Lie less about how long an autoinstall takes
+
+ -- Mitchell Berger <mitchb@mit.edu>  Fri, 01 Jun 2018 02:28:00 -0400
+
 invirt-web (0.1.51) unstable; urgency=low
 
   * Add "renumber" to the list of valid commands.