Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/pkg-exppsy/neurodebian: (66 commits)
  adding neurodebian and its aliased pkgs to neurodebian.cfg
  Boosted policy to 3.9.2 -- no changes
  adjust changelog for release
  nd_adddistall to add to all dists not just nd
  list to email on survey
  recommend ubuntu-keyring (backported) and moved python into recommends
  BF: removing hardcoded for debug purposes $PWD/
  make all leading dirs to aptcache as well
  removed duplicate Suggests:
  NH: little helper to initiate chroots for all supported distros
  BF: time into recommends since used in nd_ scripts
  BF: call apt-key add explicitly for older Ubuntus
  scaled neurodebian_back down to 74% (makes around 260mm width)
  changed "Debian" into white + fixed tiny bits of openlogo which flew away
  reduced size of pocket logo to match already printed size
  reordered dists by age to match Debian ones order
  RF: only suggest virtualbox-ose while installing neurodebian-dev
  NF: nd_rebuildarchive helper to rebuild archive for a new release
  ENH: allow for custom version suffix prefix in backport-dsc
  T-shirt artwork.
  ...

diff --git a/live/auto/config b/live/auto/config
index c804d4e400568394208b42a1add92264c019a62d..ebafd66b1dbb6a4b6befd2298517fbccc6dc6212 100755 (executable)
--- a/live/auto/config
+++ b/live/auto/config
@@ -4,7 +4,7 @@ set -eu
 
 # the Debian release to use as a basis for the live-cd
 nd_basedist="squeeze"
-nd_version="6.0.1"
+nd_version="6.0.3"
 nd_arch=i386
 
 deb_mirror="http://debproxy:9999"
@@ -33,7 +33,7 @@ lb config noauto \
   --iso-application "NeuroDebian Live" \
   --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)" \
+  --iso-volume "NeuroDebian Live ${nd_version} $nd_arch" \
   --keyring-packages "debian-archive-keyring neurodebian-keyring" \
   --memtest memtest86+ \
   --mirror-bootstrap "${deb_mirror}/debian/" \
@@ -43,7 +43,7 @@ lb config noauto \
   --repositories neuro.debian.net \
   --security true \
   --syslinux-splash neurodebian-splash.png \
-  --syslinux-timeout 10 \
+  --syslinux-timeout 4 \
   --username brain \
   --win32-loader enabled \
   ${@}

diff --git a/live/config/chroot_local-hooks/all_chroot_linux-modules.sh b/live/config/chroot_local-hooks/all_chroot_linux-modules.sh
new file mode 100755 (executable)
index 0000000..f01c9e9
--- /dev/null
+++ b/live/config/chroot_local-hooks/all_chroot_linux-modules.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# This is a hook for live-build(7) to add entries to /etc/modules.
+# To enable it, copy or symlink this hook into your config/chroot_local-hooks
+# directory.
+
+MODULES="vfat"
+
+for MODULE in ${MODULES}
+do
+       if ! grep -qs /etc/modules ${MODULE}
+       then
+               echo ${MODULE} >> /etc/modules
+       fi
+done