X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=live%2Fauto%2Fconfig;h=ebafd66b1dbb6a4b6befd2298517fbccc6dc6212;hb=2790b1742bb41cca70dfaafe588a85aa2cbbbc67;hp=eb39510e258a35f65a907dab62ed6963378ca176;hpb=57721c2da5cdbc1859b7c97c066f5bfdea15df8e;p=neurodebian.git

diff --git a/live/auto/config b/live/auto/config
index eb39510..ebafd66 100755
--- a/live/auto/config
+++ b/live/auto/config
@@ -4,42 +4,46 @@ set -eu
 
 # the Debian release to use as a basis for the live-cd
 nd_basedist="squeeze"
-nd_version="6.0.0"
+nd_version="6.0.3"
+nd_arch=i386
 
 deb_mirror="http://debproxy:9999"
 
 # Prepare splash screen
-if [ ! -e neurodebian-splash.xpm.gz ]; then
+if [ ! -e neurodebian-splash.png ]; then
     # For Grub2 it should be .tga;
 	# NOTE: RLE compression is not supported by imagemagick for write
-	xcf2png -o neurodebian-splash.png ../artwork/wallpaper_hotbrain.xcf
-	convert neurodebian-splash.png -geometry 640x480 neurodebian-splash.xpm.gz
+	xcf2png -o neurodebian-splash-big.png ../artwork/wallpaper_hotbrain.xcf
+	convert neurodebian-splash-big.png -crop 1400x1050+280 -geometry 640x480 \
+		neurodebian-splash.png
 fi
 
 # enable recommends for now since we care about 'typical' use patterns atm
 lb config noauto \
   --apt apt \
   --apt-recommends true \
-  --architecture i386 \
+  --architecture ${nd_arch} \
   --archive-areas "main contrib non-free" \
   --binary-images iso-hybrid \
   --binary-indices none \
   --bootstrap-flavour standard \
   --debian-installer netinst \
   --distribution ${nd_basedist} \
-  --grub-splash neurodebian-splash.xpm.gz \
   --hostname neurodebian \
   --iso-application "NeuroDebian Live" \
-  --iso-preparer "NeuroDebian v.{nd_version}; http://neuro.debian.net" \
+  --iso-preparer "NeuroDebian ${nd_version}; http://neuro.debian.net" \
   --iso-publisher "NeuroDebian project; http://neuro.debian.net" \
+  --iso-volume "NeuroDebian Live ${nd_version} $nd_arch" \
   --keyring-packages "debian-archive-keyring neurodebian-keyring" \
+  --memtest memtest86+ \
   --mirror-bootstrap "${deb_mirror}/debian/" \
   --mirror-chroot "${deb_mirror}/debian/" \
   --mirror-chroot-security "${deb_mirror}/security/" \
-  --packages-lists "nd-basic nd-neuroimaging nd-electrphysiology" \
+  --packages-lists "nd-core nd-neuroimaging nd-neuroimaging-doc nd-electrphysiology nd-electrphysiology-doc" \
   --repositories neuro.debian.net \
   --security true \
-  --syslinux-timeout 10 \
+  --syslinux-splash neurodebian-splash.png \
+  --syslinux-timeout 4 \
   --username brain \
   --win32-loader enabled \
   ${@}