[SCM] debian-live/config-junior branch, master, updated. 69d116a5d1719716e29f504dc01ab616752c84f2

[Daniel Baumann]

The branch, master has been updated
       via  69d116a5d1719716e29f504dc01ab616752c84f2 (commit)
      from  9b358ba68ffbfec1347a2f3651c7bc4073f8fd15 (commit)


- Shortlog ------------------------------------------------------------
69d116a Updating.

Summary of changes:
 gnome-junior/config/binary |   24 ++++++++++++++----------
 gnome-junior/config/chroot |    6 +++---
 gnome-junior/config/common |   10 +++++-----
 gnome-junior/config/source |    4 ++--
 4 files changed, 24 insertions(+), 20 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 69d116a5d1719716e29f504dc01ab616752c84f2
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 17 13:47:19 2007 +0200

    Updating.

diff --git a/gnome-junior/config/binary b/gnome-junior/config/binary
index 3c0615f..83646ef 100644
--- a/gnome-junior/config/binary
+++ b/gnome-junior/config/binary
@@ -8,9 +8,13 @@ LH_BINARY_IMAGES="iso"
 # (Default: enabled)
 LH_BINARY_INDICES="enabled"
 
-# $LH_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND=""
+LH_BOOTAPPEND_LIVE=""
+
+# $LH_BOOTAPPEND_INSTALL: set boot parameters
+# (Default: empty)
+LH_BOOTAPPEND_INSTALL="-- ${LH_BOOTAPPEND_LIVE}"
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
@@ -22,7 +26,7 @@ LH_BOOTLOADER="syslinux"
 LH_CHROOT_BUILD="enabled"
 
 # $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: enabled)
+# (Default: disabled)
 LH_DEBIAN_INSTALLER="disabled"
 
 # $LH_DEBIAN_INSTALLER_DAILY: set daily images
@@ -38,24 +42,24 @@ LH_ENCRYPTION=""
 LH_GRUB_SPLASH=""
 
 # $LH_HOSTNAME: set hostname
-# (Default: debian-jr)
+# (Default: debian)
 LH_HOSTNAME="debian-jr"
 
 # $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Jr. Live)
+# (Default: Debian Live)
 LH_ISO_APPLICATION="Debian Jr. Live"
 
 # $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a24; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper 1.0~a24; http://packages.qa.debian.org/live-helper"
+# (Default: live-helper 1.0~a29; http://packages.qa.debian.org/live-helper)
+LH_ISO_PREPARER="live-helper 1.0~a29; http://packages.qa.debian.org/live-helper"
 
 # $LH_ISO_PUBLISHER: set iso preparer
-# (Default: Debian Jr. project; http://www.debian.org/devel/debian-jr; debian-jr at lists.debian.org)
+# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
 LH_ISO_PUBLISHER="Debian Jr. project; http://www.debian.org/devel/debian-jr; debian-jr at lists.debian.org"
 
 # $LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian Jr. Live 20070831)
-LH_ISO_VOLUME="Debian Jr. Live 20070831"
+# (Default: Debian Live `date +%Y%m%d-%H:%M`)
+LH_ISO_VOLUME="Debian Jr. Live `date +%Y%m%d-%H:%M`"
 
 # $LH_MEMTEST: set memtest
 # (Default: memtest86+)
diff --git a/gnome-junior/config/chroot b/gnome-junior/config/chroot
index da0bacf..dc106a6 100644
--- a/gnome-junior/config/chroot
+++ b/gnome-junior/config/chroot
@@ -22,7 +22,7 @@ LH_KEYRING_PACKAGES=""
 
 # $LH_LANGUAGE: set language to use
 # (Default: empty)
-LH_LANGUAGE=""
+LH_LANGUAGE="en"
 
 # $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
@@ -30,14 +30,14 @@ LH_LINUX_FLAVOURS="486"
 
 # $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
 # $LH_PACKAGES: set packages to install
 # (Default: empty)
 LH_PACKAGES=""
 
 # $LH_PACKAGES_LISTS: set package list to install
-# (Default: gnome-junior)
+# (Default: standard)
 LH_PACKAGES_LISTS="gnome-junior"
 
 # $LH_TASKS: set tasks to install
diff --git a/gnome-junior/config/common b/gnome-junior/config/common
index 0ccd415..d236a8e 100644
--- a/gnome-junior/config/common
+++ b/gnome-junior/config/common
@@ -1,7 +1,7 @@
 # config/common - common options for live-helper(7)
 
 # $LH_APT: set package manager
-# (Default: apt-get)
+# (Default: aptitude)
 LH_APT="apt-get"
 
 # $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
@@ -21,7 +21,7 @@ LH_APT_PDIFFS="enabled"
 LH_APT_PIPELINE=""
 
 # $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: disabled)
+# (Default: enabled)
 LH_APT_RECOMMENDS="disabled"
 
 # $LH_APT_SECURE: set apt/aptitude security
@@ -29,8 +29,8 @@ LH_APT_RECOMMENDS="disabled"
 LH_APT_SECURE="enabled"
 
 # $LH_BOOTSTRAP: set bootstrap program
-# (Default: cdebootstrap)
-LH_BOOTSTRAP="cdebootstrap"
+# (Default: debootstrap)
+LH_BOOTSTRAP="debootstrap"
 
 # $LH_CACHE: control cache
 # (Default: enabled)
@@ -65,7 +65,7 @@ LH_DEBCONF_PRIORITY="critical"
 LH_GENISOIMAGE="genisoimage"
 
 # $LH_INITRAMFS: set initramfs hook
-# (Default: live-initramfs)
+# (Default: auto)
 LH_INITRAMFS="live-initramfs"
 
 # $LH_LOSETUP: set losetup program
diff --git a/gnome-junior/config/source b/gnome-junior/config/source
index 1d01abc..1ac0ea6 100644
--- a/gnome-junior/config/source
+++ b/gnome-junior/config/source
@@ -5,5 +5,5 @@
 LH_SOURCE="disabled"
 
 # $LH_SOURCE_IMAGES: set image type
-# (Default: generic)
-LH_SOURCE_IMAGES="generic"
+# (Default: tar)
+LH_SOURCE_IMAGES="tar"

-- 
debian-live/config-junior