From d510cb168cb302dc9214d1c97ccc0b27ef390632 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri, 20 Jul 2012 12:44:09 -0400
Subject: [PATCH] ENH: adjusted initial_setup and preseed.cfg for wheezy

---
 vm/d-i/wheezy/initial_setup | 23 ++++++++++++-----------
 vm/d-i/wheezy/preseed.cfg   | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/vm/d-i/wheezy/initial_setup b/vm/d-i/wheezy/initial_setup
index 6c2e5af..bdddf3e 100755
--- a/vm/d-i/wheezy/initial_setup
+++ b/vm/d-i/wheezy/initial_setup
@@ -47,12 +47,13 @@ git config --global user.email nd@localhost
 # -----------------
 
 # Add sources.list for backports and neurodebian
-wget -O /etc/apt/sources.list.d/neuro.debian.net.list http://neuro.debian.net/lists/squeeze.us-nh
+wget -O /etc/apt/sources.list.d/neuro.debian.net.list http://neuro.debian.net/lists/wheezy.us-nh
 
-echo "deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free" > /etc/apt/sources.list.d/backports.debian.org.list
+## No backports yet
+## echo "deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free" > /etc/apt/sources.list.d/backports.debian.org.list
 cat << EOT > /etc/apt/preferences.d/backports.debian.org.pref
 Package: *
-Pin: release a=squeeze-backports
+Pin: release a=wheezy-backports
 Pin-Priority: 200
 EOT
 
@@ -79,11 +80,11 @@ cdarch=${cunamer##*-}
 [ $cdarch = '486' ] && darch='686' || darch=$cdarch
 apt-get install -y linux-headers-2.6-$cdarch
 
-# Forcefully install guest additions from backports so we are
-# compatible with VirtualBox 4.x series
-apt-get install -y -t squeeze-backports virtualbox-ose-guest-dkms \
-	virtualbox-ose-guest-utils  virtualbox-ose-guest-x11 \
-	>| /var/log/initial_setup-dkms.log 2>&1
+## # Forcefully install guest additions from backports so we are
+## # compatible with VirtualBox 4.x series
+## apt-get install -y -t wheezy-backports virtualbox-ose-guest-dkms \
+## 	virtualbox-ose-guest-utils  virtualbox-ose-guest-x11 \
+## 	>| /var/log/initial_setup-dkms.log 2>&1
 
 # to get all the rest stuff in recommends
 apt-get install -y dkms neurodebian-guest-additions
@@ -112,7 +113,7 @@ adduser brain vboxsf
 find /lib/modules/*$darch -iname vboxsf.ko | grep -q .
 
 apt-get install --no-install-recommends -y \
- gnome-core mc evince bash-completion ntpdate file-roller gnome-utils \
+ gnome-core mc evince bash-completion ntpdate file-roller \
  gnome-themes eog vim reportbug \
  software-center gdebi gedit-plugins gnome-media synaptic menu less libxp6
 
@@ -132,7 +133,7 @@ find /var/cache/apt/archives/ -name '*.deb' -delete
 
 # cleanup unwanted stuff
 # video drivers (all but vesa)
-apt-get purge -y $(apt-cache search --names-only --installed xserver-xorg-video | grep xserver-xorg-video | cut -d ' ' -f 1,1) xserver-xorg-video-vesa+
+apt-get purge -y --force-yes $(apt-cache search --names-only --installed xserver-xorg-video | grep xserver-xorg-video | cut -d ' ' -f 1,1) xserver-xorg-video-vesa+
 apt-get purge -y brasero
 
 # and whatever is obsolete
@@ -140,7 +141,7 @@ apt-get autoremove --purge -y
 
 # custom config
 # use NeuroDebian website as default homepage
-sed -i -e 's,http://www.debian.org,http://neuro.debian.net,g' /etc/chromium-browser/master_preferences
+sed -i -e 's,http://www.debian.org,http://neuro.debian.net,g' /etc/chromium*/master_preferences
 
 # reduce grub timeout to speed up boot of VM
 sed -i -e 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=1/g' /etc/default/grub
diff --git a/vm/d-i/wheezy/preseed.cfg b/vm/d-i/wheezy/preseed.cfg
index 4b78566..4b07195 100644
--- a/vm/d-i/wheezy/preseed.cfg
+++ b/vm/d-i/wheezy/preseed.cfg
@@ -1,17 +1,31 @@
 #### Contents of the preconfiguration file (for squeeze)
 ### Notes:
 ###   WiP: not entirely tested and relies on our local proxy 10.0.0.1:9999 atm
+### Hints:
+###   To get a list of current d-i setting keys, run
+###     sudo debconf-get-selections --installer
+###   on an up-to-date system
 ###
 ### Localization
 # Locale sets language and country.
 d-i debian-installer/locale string en_US
+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
 #d-i console-setup-pc-ekmap/keymap select us
+# Need to set "American English" for "Keymap to use"
 d-i countrychooser/country-name select United States
 # Example for a different keyboard architecture
 #d-i console-keymaps-usb/keymap select mac-usb-us
+d-i console-keymaps-at/keymap select us
+
+# try avoiding even messing with above settings to figure out correct
+# for wheezy and just skip them altogether
+d-i console-tools/archs select skip-config
 
 ### Network configuration
 # netcfg will choose an interface that has link if possible. This makes it
-- 
2.39.2