install gnome list, standard debootstrap -- lets target usability, add nonfree firmwa...

diff --git a/live/auto/clean b/live/auto/clean
index ed7fcbc1c8a09fbd8e48f2cbe2a44bae0063ac72..1bc9ffbb48e7294a15ef9a346e1a64978d1a2fd7 100755 (executable)
--- a/live/auto/clean
+++ b/live/auto/clean
@@ -3,3 +3,4 @@ lb clean noauto ${@}
 rm -f config/binary config/bootstrap \
  config/chroot config/common config/source
 rm -f binary.log
+rm -f neurodebian-splash*

diff --git a/live/auto/config b/live/auto/config
index e610e36a86af9d4ef4b9a0d527be277b48f5b3c5..2e51f3250de0465b60dc8225e561f849e43c58d9 100755 (executable)
--- a/live/auto/config
+++ b/live/auto/config
@@ -8,6 +8,14 @@ nd_version="6.0.0"
 
 deb_mirror="http://debproxy:9999"
 
+# Prepare splash screen
+if [ ! -e neurodebian-splash.xpm.gz ]; 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
+fi
+
 # enable recommends for now since we care about 'typical' use patterns atm
 lb config noauto \
   --apt apt \
@@ -16,19 +24,22 @@ lb config noauto \
   --archive-areas "main contrib non-free" \
   --binary-images iso-hybrid \
   --binary-indices none \
-  --bootstrap-flavour minimal \
+  --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-publisher "NeuroDebian project; http://neuro.debian.net" \
+  --keyring-packages "debian-archive-keyring neurodebian-keyring" \
   --mirror-bootstrap "${deb_mirror}/debian/" \
   --mirror-chroot "${deb_mirror}/debian/" \
   --mirror-chroot-security "${deb_mirror}/security/" \
-  --packages-lists "nd-basic nd-neuroimaging" \
+  --packages-lists "gnome nd-basic nd-neuroimaging" \
   --repositories neuro.debian.net \
   --security true \
+  --syslinux-timeout 10 \
   --username brain \
   --win32-loader enabled \
   ${@}
@@ -46,3 +57,6 @@ lb config noauto \
 
 # Do we need any of the additional tools from live.debian.net?
 #  --repositories live.debian.net \
+
+# Should we enable backports repo? then add
+#  debian-backports-keyring

diff --git a/live/config/chroot_local-packageslists/nd-basic.list b/live/config/chroot_local-packageslists/nd-basic.list
index f45eb015efa754271c27fe2022d7c40ae7e5771d..09da214a560039c1a194939fc90d1a7cfc21bd28 100644 (file)
--- a/live/config/chroot_local-packageslists/nd-basic.list
+++ b/live/config/chroot_local-packageslists/nd-basic.list
@@ -1,3 +1,10 @@
 gnome-core mc evince bash-completion ntpdate file-roller gnome-utils
 gnome-themes eog vim
 software-center gdebi gedit-plugins gnome-media synaptic menu less
+
+#if ARCHIVE_AREAS non-free
+firmware-linux-nonfree
+#endif
+
+# NeuroDebian specifics
+neurodebian-desktop