[Debian-live-changes] r1115 - configs/gnome-junior/config

[Ben Armstrong]

Author: synrg
Date: 2007-04-21 12:57:58 +0000 (Sat, 21 Apr 2007)
New Revision: 1115

Added:
   configs/gnome-junior/config/binary_grub/
   configs/gnome-junior/config/binary_localincludes/
   configs/gnome-junior/config/binary_syslinux/
   configs/gnome-junior/config/chroot_localpackageslists/
   configs/gnome-junior/config/chroot_sources/
Removed:
   configs/gnome-junior/config/chroot_localpackageslist/
Modified:
   configs/gnome-junior/config/chroot
   configs/gnome-junior/config/common
   configs/gnome-junior/config/image
Log:
Bring up to date with current live-helper configs

Modified: configs/gnome-junior/config/chroot
===================================================================
--- configs/gnome-junior/config/chroot	2007-04-21 09:46:05 UTC (rev 1114)
+++ configs/gnome-junior/config/chroot	2007-04-21 12:57:58 UTC (rev 1115)
@@ -8,6 +8,14 @@
 # (Default: autodetected)
 LIVE_KERNEL_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
 
+# $LIVE_KEYRING_PACKAGES: set the keyring packages
+# (Default: empty)
+LIVE_KEYRING_PACKAGES=""
+
+# $LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS=""
+
 # $LIVE_LANGUAGE: set the language to use
 # (Default: empty)
 LIVE_LANGUAGE=""
@@ -17,7 +25,7 @@
 LIVE_PACKAGES=""
 
 # $LIVE_PACKAGES_LISTS: set the package list to install
-# (Default: standard)
+# (Default: gnome-junior)
 LIVE_PACKAGES_LISTS="gnome-junior"
 
 # $LIVE_TASKS: set the tasks to install

Copied: configs/gnome-junior/config/chroot_localpackageslists (from rev 1114, configs/gnome-junior/config/chroot_localpackageslist)

Modified: configs/gnome-junior/config/common
===================================================================
--- configs/gnome-junior/config/common	2007-04-21 09:46:05 UTC (rev 1114)
+++ configs/gnome-junior/config/common	2007-04-21 12:57:58 UTC (rev 1115)
@@ -1,5 +1,9 @@
 # config/common: configuration for live-helper(7)
 
+# $LH_MODE: set distribution mode
+# (Default: debian)
+LH_MODE="debian"
+
 # $LH_APT: set package manager
 # (Default: aptitude)
 LH_APT="aptitude"
@@ -44,6 +48,10 @@
 # (Default: critical)
 LH_DEBCONF_PRIORITY="critical"
 
+# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: yes)
+LH_DEBCONF_NOWARNINGS="yes"
+
 # $LH_GENISOIMAGE: set the genisoimage program
 # (Default: genisoimage)
 LH_GENISOIMAGE="genisoimage"
@@ -52,6 +60,32 @@
 # (Default: autodetected)
 LH_LOSETUP="losetup"
 
+# $LH_TASKSEL: set the tasksel program
+# (Default: aptitude)
+LH_TASKSEL="aptitude"
+
 # $LIVE_ROOT: set the root directory
 # (Default: junior)
 LIVE_ROOT="junior"
+
+# Live-helper options
+
+# $LH_BREAKPOINTS: enable breakpoints
+# (Default: disabled)
+LH_BREAKPOINTS="disabled"
+
+# $LH_DEBUG: enable debug
+# (Default: disabled)
+LH_DEBUG="disabled"
+
+# $LH_FORCE: enable force
+# (Default: disabled)
+LH_FORCE="disabled"
+
+# $LH_QUIET: enable quiet
+# (Default: disabled)
+LH_QUIET="disabled"
+
+# $LH_VERBOSE: enable verbose
+# (Default: disabled)
+LH_VERBOSE="disabled"

Modified: configs/gnome-junior/config/image
===================================================================
--- configs/gnome-junior/config/image	2007-04-21 09:46:05 UTC (rev 1114)
+++ configs/gnome-junior/config/image	2007-04-21 12:57:58 UTC (rev 1115)
@@ -20,13 +20,13 @@
 # (Default: squashfs)
 LIVE_FILESYSTEM="squashfs"
 
-# $LIVE_MEMTEST86: set memtest86+
-# (Default: enabled)
-LIVE_MEMTEST86="enabled"
+# $LIVE_MEMTEST: set memtest
+# (Default: memtest86+)
+LIVE_MEMTEST="memtest86+"
 
 # $LIVE_ISO_VOLUME: set iso volume
-# (Default: Debian Jr. Live `date +%Y%m%d`)
-LIVE_ISO_VOLUME="Debian Jr. Live `date +%Y%m%d`"
+# (Default: Debian Jr. Live 20070329)
+LIVE_ISO_VOLUME="Debian Jr. Live 20070329"
 
 # $LIVE_SERVER_ADDRESS: set the netboot server address
 # (Default: 192.168.1.1)
@@ -40,10 +40,14 @@
 # (Default: )
 LIVE_SOURCE="disabled"
 
-# $LIVE_SYSLINUX: set syslinux option
-# (Default: enabled)
-LIVE_SYSLINUX="enabled"
+# $LIVE_BOOTLOADER: set bootloader
+# (Default: syslinux)
+LIVE_BOOTLOADER="syslinux"
 
+# $LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH=""
+
 # $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
 LIVE_SYSLINUX_SPLASH=""