VM: depends on zenity, install ipython01x only for older ones, default XFCE4 pannel

[neurodebian.git] / vm / d-i / wheezy / initial_setup

diff --git a/vm/d-i/wheezy/initial_setup b/vm/d-i/wheezy/initial_setup
index 63532b4e26241649e99c291ababd4e58288cf630..76831e74e6a9bdc9e79b89049ccc29db49eb1f6a 100755 (executable)
--- a/vm/d-i/wheezy/initial_setup
+++ b/vm/d-i/wheezy/initial_setup
@@ -48,6 +48,9 @@ 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/wheezy.us-nh
+# Development versions (TODO: comment out upon finishing)
+cat /etc/apt/sources.list.d/neuro.debian.net.list | sed -e 's,/debian ,/debian-devel ,g' \
+       >| /etc/apt/sources.list.d/neuro.debian.net-devel.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
@@ -77,7 +80,7 @@ touch /dev/vboxguest
 cunamer=`uname -r`
 cdarch=${cunamer##*-}
 # We carry 686 only
-[ $cdarch = '486' ] && darch='686' || darch=$cdarch
+[ $cdarch = '486' ] && darch='686-pae' || darch=$cdarch
 apt-get install -y linux-headers-$cdarch
 
 ## # Forcefully install guest additions from backports so we are
@@ -87,8 +90,7 @@ apt-get install -y linux-headers-$cdarch
 ##     >| /var/log/initial_setup-dkms.log 2>&1
 
 # to get all the rest stuff in recommends
-apt-get install -y dkms
-# TODO: neurodebian-guest-additions  -- pulls in gdm3 ATM
+apt-get install -y dkms neurodebian-guest-additions
 
 if [ "$darch" != "$cdarch" ] ; then
     # Because DKMS builds for currently running kernel, which during
@@ -123,14 +125,18 @@ apt-get install --no-install-recommends -y \
  mc evince bash-completion ntpdate file-roller \
  eog vim reportbug \
  software-center synaptic menu less libxp6 \
- task-xfce-desktop lightdm \
+ task-xfce-desktop lightdm zenity \
  chromium-browser \
  sudo neurodebian-desktop update-notifier
 
+# "Slightly" better terminal by default
+# TODO: might want to change default bg color to black there
+apt-get install -y rxvt-unicode
+update-alternatives --set x-terminal-emulator /usr/bin/urxvt
+
 # XXX last ones are actually pulled it by neurodebian-guest-additions whenever we
 # resolve their destiny ;-)   a;though it might be pooling too much, eg exim4
 
-# TODO: autologin for lightdm (autologin-user=brain in /etc/lightdm/lightdm.conf), default panel (with chromium) for xfce
 # TODO: pre-configure the panel "Welcome to the first start of the panel", "Use default config"?
 
 # Clean-up installed development files which got pulled in for
@@ -159,12 +165,20 @@ apt-get autoremove --purge -y
 # use NeuroDebian website as default homepage
 sed -i -e 's,http://www.debian.org,http://neuro.debian.net,g' /etc/chromium*/master_preferences
 
+# Place default XFCE4 panel config, otherwise a dialog appears
+# Thanks go to cavalier@freenode IRC for the hint
+xfdir=/home/brain/.config/xfce4/xfconf/xfce-perchannel-xml
+mkdir -p $xfdir
+cp /etc/xdg/xfce4/panel/default.xml $xfdir/xfce4-panel.xml
+chown brain.brain -R /home/brain/.config
+
 # reduce grub timeout to speed up boot of VM
 sed -i -e 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=1/g' /etc/default/grub
 update-grub
 
 # finally configure geomirror for APT and disable deb-src lists
-sed -i -e "s,\(deb\(\|-src\) http://\)[^/]*/,\1$(dpkg --print-architecture)-geomirror.debian.net/,g" \
+cp /etc/apt/sources.list /etc/apt/sources.list.orig
+sed -i -e "s,\(deb\(\|-src\) http://\)[^/]*/debian,\1$(dpkg --print-architecture)-geomirror.debian.net/debian,g" \
     -e "s/^deb-src/#deb-src/" /etc/apt/sources.list
 
 etckeeper commit "Initial VM setup done"