X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vm%2Fd-i%2Ftools%2Finitial_setup;h=1b19b02c1c545ac94b4e98dc2af1d2e2a491bc67;hb=58b66a815ed5e5d1e85fb854e416987d7e08da2e;hp=c0466e4a577a54ba31bffd38f37f256901504816;hpb=a484707f8e28b80057cb3387877b6afc2e6e0b71;p=neurodebian.git

diff --git a/vm/d-i/tools/initial_setup b/vm/d-i/tools/initial_setup
index c0466e4..1b19b02 100755
--- a/vm/d-i/tools/initial_setup
+++ b/vm/d-i/tools/initial_setup
@@ -47,7 +47,7 @@ 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/_static/neurodebian.squeeze.us-nh.sources.list
+wget -O /etc/apt/sources.list.d/neuro.debian.net.list http://neuro.debian.net/lists/squeeze.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
 cat << EOT > /etc/apt/preferences.d/backports.debian.org.pref
@@ -63,17 +63,57 @@ apt-get update -y
 gpg --keyserver hkp://subkeys.pgp.net --recv-keys 16BA136C && \
         gpg --export 16BA136C | apt-key add - || :
 
-apt-get install -y --allow-unauthenticated neurodebian-keyring
+apt-get install -y --allow-unauthenticated neurodebian-archive-keyring
 apt-get update -y
 
 # to cheat the VM check
 touch /dev/vboxguest
-# to get all the stuff in recommends
+
+# Assure that corresponding linux headers are installed since otherwise they
+# might not be.  There is also a dichotomy between target 686 and installer
+# using 486 build of the kernel.  It requires manual build/installation
+# of guest additions for 686 at this point. Hence all the ugly logic below
+cunamer=`uname -r`
+cdarch=${cunamer##*-}
+# We carry 686 only
+[ $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
+
+# to get all the rest stuff in recommends
 apt-get install -y dkms neurodebian-guest-additions
 
+if [ "$darch" != "$cdarch" ] ; then
+    # Because DKMS builds for currently running kernel, which during
+    # installation might be a more generic 486, lets force building for 686
+	# and also install necessary headers (will be purged later on anyways)
+	apt-get install -y linux-headers-2.6-$darch
+
+	unamer=${cunamer//$cdarch/$darch}
+	# First collect information about installed vb additions
+	vbg=( `dkms status | grep virtualbox | head -n 1 | tr ',' ' '` )
+	echo "I: forcing build and install of guest additions for 686"
+	dkms build -m ${vbg[0]} -v ${vbg[1]} -a i686 -k $unamer \
+		>| /var/log/initial_setup-dkms-686-build.log 2>&1
+	dkms install -m ${vbg[0]} -v ${vbg[1]} -a i686 -k $unamer \
+		>| /var/log/initial_setup-dkms-686-install.log 2>&1
+fi
+
+# Add brain use into vboxsf group so he gets access to shared folders
+# by default
+adduser brain vboxsf
+
+# assure at the end that we got right modules build in the right location
+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-themes eog vim reportbug \
+ gnome-themes gnome-disk-utility network-manager-gnome eog vim reportbug \
  software-center gdebi gedit-plugins gnome-media synaptic menu less libxp6
 
 # Clean-up installed development files which got pulled in for