vm: purge dkms build dir, freepats, fix removing of apt lists

diff --git a/vm/d-i/wheezy/initial_setup b/vm/d-i/wheezy/initial_setup
index 26116205b2b79502cfac156726c6c4d5ae9d2b8d..b192fb606cf864fc60befffa233633c7b9692e76 100755 (executable)
--- a/vm/d-i/wheezy/initial_setup
+++ b/vm/d-i/wheezy/initial_setup
@@ -109,6 +109,9 @@ if [ "$darch" != "$cdarch" ] ; then
                >| /var/log/initial_setup-dkms-686-install.log 2>&1
 fi
 
+# Prune DKMS's build -- should be no need to carry it around
+find /var/lib/dkms -iname build | xargs -r rm -rf
+
 # Add brain use into vboxsf group so he gets access to shared folders
 # by default
 adduser brain vboxsf
@@ -138,7 +141,6 @@ 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: 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
 # VM guest additions (to build kernel modules via DKMS)
@@ -157,7 +159,10 @@ find /var/cache/apt/archives/ -name '*.deb' -delete
 # cleanup unwanted stuff
 # video drivers (all but 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
+apt-get purge -y brasero freepats
+
+# Seems to be not used by any installed piece
+apt-get purge -y libwebkitgtk-1.0-0
 
 # and whatever is obsolete
 apt-get autoremove --purge -y

diff --git a/vm/tools/nd_compactvdi b/vm/tools/nd_compactvdi
index 3d1634d058c2d8a8fc596e0543f1b4753794ccb8..eb7a6f32c11beedf9d4f09245892b9ef38a78888 100755 (executable)
--- a/vm/tools/nd_compactvdi
+++ b/vm/tools/nd_compactvdi
@@ -42,7 +42,7 @@ rm -rf vbmnt/tmp/*
 # log files
 find vbmnt/var/log -type f -delete
 # apt lists
-find vbmnt/var/lib/apt -type f -name '*debian*' -o -type f -name '*list*' -delete
+find vbmnt/var/lib/apt -type f -name '*debian*' -o -type f -name '*list*' | xargs -r rm
 # user data
 # cannot clean all root stuff, because it also contains useful thing (e.g. git setup)
 rm -f vbmnt/root/.*history

diff --git a/vm/tools/nd_createappliance b/vm/tools/nd_createappliance
index 9e21abc4b0fe1631302fefa89f40229a4a471ad3..e7ad0a7afbfbe1b46e6f317c966a151c4da43ea5 100755 (executable)
--- a/vm/tools/nd_createappliance
+++ b/vm/tools/nd_createappliance
@@ -8,7 +8,7 @@ set -eu
 build_dir=$PWD/build
 dist_dir=$PWD/dist
 vendor="NeuroDebian"
-vm_version="6.999.b4.20121206"
+vm_version="6.999.b4.20121231"
 vm_ostype=Debian
 vendor_url="http://neuro.debian.net"
 product_url="${vendor_url}/vm.html"