WIP: work on locale and remove HTTP server

this should be factored out and become a command line option
to the create appliance scripts...

diff --git a/vm/d-i/wheezy/preseed.cfg b/vm/d-i/wheezy/preseed.cfg
index 862284ef406459e539f4157a63292edfc5ace1e3..9ec5f33b62780f89c21134faa8d4203fef2254db 100644 (file)
--- a/vm/d-i/wheezy/preseed.cfg
+++ b/vm/d-i/wheezy/preseed.cfg
@@ -1,6 +1,4 @@
-#### Contents of the preconfiguration file (for squeeze)
-### Notes:
-###   WiP: not entirely tested and relies on our local proxy 10.0.0.1:9999 atm
+#### Contents of the preconfiguration file (for wheezy)
 ### Hints:
 ###   To get a list of current d-i setting keys, run
 ###     sudo debconf-get-selections --installer
@@ -8,11 +6,9 @@
 ###
 ### Localization
 # Locale sets language and country.
-d-i debian-installer/locale string en_US
+d-i debian-installer/locale string en_US.UTF-8
 d-i debian-installer/language string en
 d-i debian-installer/country string US
-##d-i debian-installer/keymap string us
-##d-i debconf/language string en
 
 # Keyboard selection.
 #d-i console-tools/archs select at
@@ -82,7 +78,7 @@ d-i netcfg/invalid_hostname string neurodebian
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
-d-i mirror/http/hostname string 10.0.0.1:9999
+d-i mirror/http/hostname string ftp.debian.de
 d-i mirror/http/directory string /debian
 #d-i mirror/http/proxy string
 
@@ -97,7 +93,7 @@ d-i clock-setup/utc boolean true
 
 # You may set this to any valid setting for $TZ; see the contents of
 # /usr/share/zoneinfo/ for valid values.
-d-i time/zone string US/Eastern
+d-i time/zone string Europe/Berlin
 
 # Controls whether to use NTP to set the clock during the install
 d-i clock-setup/ntp boolean true
@@ -143,10 +139,10 @@ d-i partman-auto/choose_recipe select atomic
 # swap, and uses the rest of the space for the root partition:
 d-i partman-auto/expert_recipe string                         \
       boot-root ::                                            \
-              10000 40000 1000000000 ext3                       \
+              10000 40000 1000000000 ext4                       \
                       $primary{ } $bootable{ }                \
                       method{ format } format{ }              \
-                      use_filesystem{ } filesystem{ ext3 }    \
+                      use_filesystem{ } filesystem{ ext4 }    \
                       label{NEURODEBIAN}                      \
                       mountpoint{ / }                         \
               .                                               \
@@ -335,7 +331,7 @@ d-i debian-installer/exit/poweroff boolean true
 # packages and run commands in the target system.
 #d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
 #d-i preseed/late_command string wget -O/target/tmp/initial_setup http://git.debian.org/?p=pkg-exppsy/neurodebian.git;a=blob_plain;f=vm/d-i/tools/initial_setup;hb=HEAD; \
-d-i preseed/late_command string wget -O/target/tmp/initial_setup http://head1.hydra.dartmouth.edu/d-i/wheezy/initial_setup ; \
+d-i preseed/late_command string wget -O/target/tmp/initial_setup http://10.0.2.2:10100/initial_setup ; \
         in-target /bin/bash /tmp/initial_setup
 
 # XXX here get/call nd_setupguestos ?