[Debian-live-changes] r1771 - in configs: daniel-desktop/config daniel-test/config daniel-test/config/chroot_sources

daniel at alioth.debian.org daniel at alioth.debian.org
Sat May 26 10:17:22 UTC 2007


Author: daniel
Date: 2007-05-26 10:17:22 +0000 (Sat, 26 May 2007)
New Revision: 1771

Added:
   configs/daniel-test/config/chroot_sources/live-backports.binary
   configs/daniel-test/config/chroot_sources/live-backports.binary.gpg
   configs/daniel-test/config/chroot_sources/live-backports.bootstrap
   configs/daniel-test/config/chroot_sources/live-backports.bootstrap.gpg
Modified:
   configs/daniel-desktop/config/binary
   configs/daniel-desktop/config/bootstrap
   configs/daniel-desktop/config/chroot
   configs/daniel-desktop/config/common
   configs/daniel-desktop/config/source
   configs/daniel-test/config/binary
   configs/daniel-test/config/bootstrap
   configs/daniel-test/config/chroot
   configs/daniel-test/config/common
   configs/daniel-test/config/source
Log:


Modified: configs/daniel-desktop/config/binary
===================================================================
--- configs/daniel-desktop/config/binary	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-desktop/config/binary	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,53 +1,69 @@
-# config/chroot: configuration for lh_binary_*
+# config/binary - options for live-helper(7), binary stage
 
+# $LIVE_BINARY_IMAGES: set image type
+# (Default: iso)
+LIVE_BINARY_IMAGES="usb-hdd"
+
+# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: enabled)
+LIVE_BINARY_INDICES="enabled"
+
 # $LIVE_BOOTAPPEND: set boot parameters
 # (Default: empty)
 LIVE_BOOTAPPEND=""
 
+# $LIVE_BOOTLOADER: set bootloader
+# (Default: syslinux)
+LIVE_BOOTLOADER="syslinux"
+
+# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: disabled)
+LIVE_DEBIAN_INSTALLER="disabled"
+
 # $LIVE_ENCRYPTION: set encrytion
 # (Default: empty)
 LIVE_ENCRYPTION=""
 
-# $LIVE_USERNAME: set username
-# (Default: user)
-LIVE_USERNAME="user"
+# $LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH=""
 
 # $LIVE_HOSTNAME: set hostname
 # (Default: debian)
 LIVE_HOSTNAME="debian"
 
-# $LIVE_MEMTEST: set memtest
-# (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+# $LIVE_ISO_APPLICATION: set iso author
+# (Default: Debian Live)
+LIVE_ISO_APPLICATION="Debian Live"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+# $LIVE_ISO_PREPARER: set iso preparer
+# (Default: live-helper 1.0~a12; http://packages.qa.debian.org/live-helper)
+LIVE_ISO_PREPARER="live-helper ${VERSION}; http://packages.qa.debian.org/live-helper"
 
+# $LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
+LIVE_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
+
 # $LIVE_ISO_VOLUME: set iso volume
-# (Default: Debian Live `date +%Y%m%d`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d`"
+# (Default: Debian Live `date +%Y%m%d-%H:%M`)
+LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_SERVER_ADDRESS: set the netboot server address
-# (Default: 192.168.1.1)
-LIVE_SERVER_ADDRESS="192.168.1.1"
+# $LIVE_MEMTEST: set memtest
+# (Default: memtest86+)
+LIVE_MEMTEST="memtest86+"
 
-# $LIVE_SERVER_PATH: set the netboot server directory
+# $LIVE_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_SERVER_PATH="/srv/debian-live"
+LIVE_NET_PATH="/srv/debian-live"
 
-# $LIVE_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+# $LIVE_NET_SERVER: set netboot server address
+# (Default: 192.168.1.1)
+LIVE_NET_SERVER="192.168.1.1"
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH=""
-
 # $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
 LIVE_SYSLINUX_SPLASH=""
 
-# $LIVE_BINARY_IMAGE: set image type
-# (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+# $LIVE_USERNAME: set username
+# (Default: user)
+LIVE_USERNAME="user"

Modified: configs/daniel-desktop/config/bootstrap
===================================================================
--- configs/daniel-desktop/config/bootstrap	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-desktop/config/bootstrap	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,10 +1,10 @@
-# config/bootstrap: configuration for lh_bootstrap_*
+# config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select the chroot architecture
+# $LIVE_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
 LIVE_ARCHITECTURE="i386"
 
-# $LIVE_DISTRIBUTION: select the distribution to use
+# $LIVE_DISTRIBUTION: select distribution to use
 # (Default: etch)
 LIVE_DISTRIBUTION="etch"
 
@@ -12,26 +12,26 @@
 # (Default: empty)
 LIVE_DISTRIBUTION_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
+# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
 LIVE_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from
+# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
 # (Default: http://ftp.debian.org/debian/)
 LIVE_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from
+# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LIVE_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set the mirror which ends up in the image
+# $LIVE_MIRROR_BINARY: set mirror which ends up in the image
 # (Default: http://ftp.debian.org/debian/)
 LIVE_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image
+# $LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
 LIVE_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
 
-# $LIVE_SECTIONS: select the section(s) to use
+# $LIVE_SECTIONS: select section(s) to use
 # (Default: main)
 LIVE_SECTIONS="main contrib non-free"

Modified: configs/daniel-desktop/config/chroot
===================================================================
--- configs/daniel-desktop/config/chroot	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-desktop/config/chroot	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,38 +1,42 @@
-# config/chroot: configuration for lh_chroot_*
+# config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set filesystem
+# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
 LIVE_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_LINUX_FLAVOURS: set the kernel flavour to use
-# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="686"
+# $LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS=""
 
-# $LIVE_LINUX_PACKAGES: set the kernel packages to use
-# (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+# $LIVE_INTERACTIVE: set interactive build
+# (Default: disabled)
+LIVE_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set the keyring packages
+# $LIVE_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
 LIVE_KEYRING_PACKAGES=""
 
-# $LIVE_HOOKS: set hook commands
+# $LIVE_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_HOOKS=""
-
-# $LIVE_LANGUAGE: set the language to use
-# (Default: empty)
 LIVE_LANGUAGE=""
 
-# $LIVE_PACKAGES: set the packages to install
+# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LIVE_LINUX_FLAVOURS="686"
+
+# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+
+# $LIVE_PACKAGES: set packages to install
 # (Default: empty)
 LIVE_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set the package list to install
+# $LIVE_PACKAGES_LISTS: set package list to install
 # (Default: standard)
 LIVE_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set the tasks to install
+# $LIVE_TASKS: set tasks to install
 # (Default: empty)
 LIVE_TASKS=""
 
@@ -47,7 +51,3 @@
 # $LIVE_SYSVINIT: enable sysvinit
 # (Default: disabled)
 LIVE_SYSVINIT="disabled"
-
-# $LIVE_INTERACTIVE: set interactive build
-# (Default: disabled)
-LIVE_INTERACTIVE="disabled"

Modified: configs/daniel-desktop/config/common
===================================================================
--- configs/daniel-desktop/config/common	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-desktop/config/common	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,9 +1,5 @@
-# config/common: configuration for live-helper(7)
+# config/common - common options for live-helper(7)
 
-# $LH_MODE: set distribution mode
-# (Default: debian)
-LH_MODE="debian"
-
 # $LH_APT: set package manager
 # (Default: aptitude)
 LH_APT="aptitude"
@@ -16,67 +12,71 @@
 # (Default: autodetected or empty)
 LH_APT_HTTPPROXY=""
 
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
-LH_BINARY_INDICES="enabled"
-
 # $LH_APT_PDIFFS: set apt/aptitude pdiff indices
 # (Default: enabled)
 LH_APT_PDIFFS="enabled"
 
-# $LH_APT_RECOMMENDS: enable recommends
+# $LH_APT_RECOMMENDS: set apt/aptitude recommends
 # (Default: enabled)
-LH_BINARY_INDICES="disabled"
+LH_APT_RECOMMENDS="disabled"
 
-# $LH_APT_SECURE: enable secure
+# $LH_APT_SECURE: set apt/aptitude security
 # (Default: enabled)
 LH_APT_SECURE="enabled"
 
-# $LH_BOOTSTRAP: select the bootstrap program
+# $LH_BOOTSTRAP: set bootstrap program
 # (Default: cdebootstrap)
 LH_BOOTSTRAP="cdebootstrap"
 
-# $LH_CACHE_INDICES: control if downloaded packages should be cached
+# $LH_CACHE_INDICES: control if downloaded package indices should be cached
 # (Default: disabled)
 LH_CACHE_INDICES="disabled"
 
-# $LH_CACHE_PACKAGES: control if downloaded packages should be cached
+# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
 # (Default: enabled)
 LH_CACHE_PACKAGES="enabled"
 
-# $LH_CACHE_STAGES: control if downloaded packages should be cached
+# $LH_CACHE_STAGES: control if completed stages should be cached
 # (Default: bootstrap)
 LH_CACHE_STAGES="bootstrap"
 
-# $LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
+# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
 # (Default: noninteractive)
 LH_DEBCONF_FRONTEND="noninteractive"
 
-# $LH_DEBCONF_PRIORITY: set the debconf(1) priority to use
-# (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
+# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: critical)
+LH_DEBCONF_PRIORITY="critical"
+
+# $LH_GENISOIMAGE: set genisoimage program
 # (Default: genisoimage)
 LH_GENISOIMAGE="genisoimage"
 
-# $LH_LOSETUP: set the losetup program
+# $LH_INITRAMFS: set initramfs hook
+# (Default: live-initramfs)
+LH_INITRAMFS="live-initramfs"
+
+# $LH_LOSETUP: set losetup program
 # (Default: autodetected)
 LH_LOSETUP="losetup"
 
-# $LH_TASKSEL: set the tasksel program
+# $LH_MODE: set distribution mode
+# (Default: debian)
+LH_MODE="debian"
+
+# $LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# $LH_TASKSEL: set tasksel program
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LH_INITRAMFS: set the initramfs generator
-# (Default: casper)
-LH_INITRAMFS="live-initramfs"
-
-# $LIVE_ROOT: set the root directory
+# $LIVE_ROOT: set root directory
 # (Default: debian-live)
 LIVE_ROOT="debian-live"
 
@@ -90,10 +90,6 @@
 
 # Live-helper options
 
-# $LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
 # $LH_BREAKPOINTS: enable breakpoints
 # (Default: disabled)
 #LH_BREAKPOINTS="disabled"

Modified: configs/daniel-desktop/config/source
===================================================================
--- configs/daniel-desktop/config/source	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-desktop/config/source	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,9 +1,9 @@
-# config/chroot: configuration for lh_source_*
+# config/source - options for live-helper(7), source stage
 
 # $LIVE_SOURCE: set source option
 # (Default: )
-LIVE_SOURCE="enabled"
+LIVE_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGE: set image type
+# $LIVE_SOURCE_IMAGES: set image type
 # (Default: generic)
 LIVE_SOURCE_IMAGES="generic"

Modified: configs/daniel-test/config/binary
===================================================================
--- configs/daniel-test/config/binary	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-test/config/binary	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,53 +1,69 @@
-# config/chroot: configuration for lh_binary_*
+# config/binary - options for live-helper(7), binary stage
 
+# $LIVE_BINARY_IMAGES: set image type
+# (Default: iso)
+LIVE_BINARY_IMAGES="iso"
+
+# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: enabled)
+LIVE_BINARY_INDICES="disabled"
+
 # $LIVE_BOOTAPPEND: set boot parameters
 # (Default: empty)
 LIVE_BOOTAPPEND=""
 
+# $LIVE_BOOTLOADER: set bootloader
+# (Default: syslinux)
+LIVE_BOOTLOADER="syslinux"
+
+# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: disabled)
+LIVE_DEBIAN_INSTALLER="disabled"
+
 # $LIVE_ENCRYPTION: set encrytion
 # (Default: empty)
 LIVE_ENCRYPTION=""
 
-# $LIVE_USERNAME: set username
-# (Default: user)
-LIVE_USERNAME="user"
+# $LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH=""
 
 # $LIVE_HOSTNAME: set hostname
 # (Default: debian)
 LIVE_HOSTNAME="debian"
 
-# $LIVE_MEMTEST: set memtest
-# (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+# $LIVE_ISO_APPLICATION: set iso author
+# (Default: Debian Live)
+LIVE_ISO_APPLICATION="Debian Live"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+# $LIVE_ISO_PREPARER: set iso preparer
+# (Default: live-helper 1.0~a12; http://packages.qa.debian.org/live-helper)
+LIVE_ISO_PREPARER="live-helper ${VERSION}; http://packages.qa.debian.org/live-helper"
 
+# $LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
+LIVE_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
+
 # $LIVE_ISO_VOLUME: set iso volume
-# (Default: Debian Live `date +%Y%m%d`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d`"
+# (Default: Debian Live `date +%Y%m%d-%H:%M`)
+LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_SERVER_ADDRESS: set the netboot server address
-# (Default: 192.168.1.1)
-LIVE_SERVER_ADDRESS="192.168.1.1"
+# $LIVE_MEMTEST: set memtest
+# (Default: memtest86+)
+LIVE_MEMTEST="memtest86+"
 
-# $LIVE_SERVER_PATH: set the netboot server directory
+# $LIVE_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_SERVER_PATH="/srv/debian-live"
+LIVE_NET_PATH="/srv/debian-live"
 
-# $LIVE_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+# $LIVE_NET_SERVER: set netboot server address
+# (Default: 192.168.1.1)
+LIVE_NET_SERVER="192.168.1.1"
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH=""
-
 # $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
 LIVE_SYSLINUX_SPLASH=""
 
-# $LIVE_BINARY_IMAGE: set image type
-# (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+# $LIVE_USERNAME: set username
+# (Default: user)
+LIVE_USERNAME="user"

Modified: configs/daniel-test/config/bootstrap
===================================================================
--- configs/daniel-test/config/bootstrap	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-test/config/bootstrap	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,10 +1,10 @@
-# config/bootstrap: configuration for lh_bootstrap_*
+# config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select the chroot architecture
+# $LIVE_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
 LIVE_ARCHITECTURE="i386"
 
-# $LIVE_DISTRIBUTION: select the distribution to use
+# $LIVE_DISTRIBUTION: select distribution to use
 # (Default: etch)
 LIVE_DISTRIBUTION="etch"
 
@@ -12,26 +12,26 @@
 # (Default: empty)
 LIVE_DISTRIBUTION_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
+# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
 LIVE_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from
-# (Default: http://10.0.0.11/ftp.debian.org/debian/)
+# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: http://ftp.debian.org/debian/)
 LIVE_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from
+# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LIVE_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set the mirror which ends up in the image
+# $LIVE_MIRROR_BINARY: set mirror which ends up in the image
 # (Default: http://ftp.debian.org/debian/)
-LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
+LIVE_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image
+# $LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
-LIVE_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+LIVE_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
 
-# $LIVE_SECTIONS: select the section(s) to use
+# $LIVE_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LIVE_SECTIONS="main contrib non-free"

Modified: configs/daniel-test/config/chroot
===================================================================
--- configs/daniel-test/config/chroot	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-test/config/chroot	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,38 +1,42 @@
-# config/chroot: configuration for lh_chroot_*
+# config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set filesystem
+# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
 LIVE_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_LINUX_FLAVOURS: set the kernel flavour to use
-# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+# $LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS=""
 
-# $LIVE_LINUX_PACKAGES: set the kernel packages to use
-# (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+# $LIVE_INTERACTIVE: set interactive build
+# (Default: disabled)
+LIVE_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set the keyring packages
+# $LIVE_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
 LIVE_KEYRING_PACKAGES=""
 
-# $LIVE_HOOKS: set hook commands
+# $LIVE_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_HOOKS=""
-
-# $LIVE_LANGUAGE: set the language to use
-# (Default: empty)
 LIVE_LANGUAGE=""
 
-# $LIVE_PACKAGES: set the packages to install
+# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LIVE_LINUX_FLAVOURS="686"
+
+# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+
+# $LIVE_PACKAGES: set packages to install
 # (Default: empty)
 LIVE_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set the package list to install
+# $LIVE_PACKAGES_LISTS: set package list to install
 # (Default: standard)
 LIVE_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set the tasks to install
+# $LIVE_TASKS: set tasks to install
 # (Default: empty)
 LIVE_TASKS=""
 
@@ -47,7 +51,3 @@
 # $LIVE_SYSVINIT: enable sysvinit
 # (Default: disabled)
 LIVE_SYSVINIT="disabled"
-
-# $LIVE_INTERACTIVE: set interactive build
-# (Default: disabled)
-LIVE_INTERACTIVE="disabled"

Added: configs/daniel-test/config/chroot_sources/live-backports.binary
===================================================================
--- configs/daniel-test/config/chroot_sources/live-backports.binary	                        (rev 0)
+++ configs/daniel-test/config/chroot_sources/live-backports.binary	2007-05-26 10:17:22 UTC (rev 1771)
@@ -0,0 +1,11 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Live Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. live-backports.bootstrap and once as live-backports.binary.
+##
+## Remeber to add debian-unofficial-archive-keyring to your package selection.
+
+# Debian Live backports for Etch
+deb http://live.debian.net/debian/ etch main
+deb-src http://live.debian.net/debian/ etch main

Added: configs/daniel-test/config/chroot_sources/live-backports.binary.gpg
===================================================================
--- configs/daniel-test/config/chroot_sources/live-backports.binary.gpg	                        (rev 0)
+++ configs/daniel-test/config/chroot_sources/live-backports.binary.gpg	2007-05-26 10:17:22 UTC (rev 1771)
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEW3mTQRBACGTYsPYYtzKpjTBcuDOMyF48fcNkW069tXst8/aS1SM4Elw7j4
+sdkwTc6PCV1WBJuZObEAmsGJRyWfMVniux6HJiEjZLehyzfGPHjPaqnPeHomoTa2
+EpKT0AtqhUW2RVsGSPcx5E0w+71GOd4Rl1Dxc3kS0wqHYHfzcPsDq4xn1wCg2oV5
+oyuxyI3W4ep0uFDe1X0Du7kD/0TrkT9hsinfCga9vJ+R1Yslz9fEvRm1WvdTUW3k
+rEJs3gVIuNMF4a9SikXkBngquQA4iuj/rghFkBKexEZm52a486vZgkR5q0BD8+c/
+Ua6plRNQPdUMusymWHXnPw8Hxyt/+g21U3eCSIcktSR8kX1+dsp5MKw+Dh6wdRSb
+FOsVA/9BS4ANC0S02UzbR4Qsxutde0P0+2hUJJCfB1877p6W2vWp2UVQu11YLIfM
+sgYJjUAlMVcBFBJI1BHkK0vx2xK4w3/s9RiFa2aeY+ZGfoA6qLeKXbHHUEvj37c/
+k9Gh6MqgxUHE21X5z8GuHPRbiL+kZJt59DL5EwO+viWuEVuUZLRYRGViaWFuIFVu
+b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDcpIDxm
+dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJFt5k0AhsD
+BQkB67+ABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQOU0ZlSTFKsOXdQCfeRoG
+HjLLQmYPM8iP1/7WyEY9uaEAnApx8isAZY0rlL13vx++lPF+M9reiEYEEBECAAYF
+AkW3mU8ACgkQ+C5cwEsrK56jCQCghT9KL/I1G6nUw+9bYr1qjQWVDzgAn3KUtyE/
+uc4k+zApv632x2susVIq
+=BzDd
+-----END PGP PUBLIC KEY BLOCK-----

Added: configs/daniel-test/config/chroot_sources/live-backports.bootstrap
===================================================================
--- configs/daniel-test/config/chroot_sources/live-backports.bootstrap	                        (rev 0)
+++ configs/daniel-test/config/chroot_sources/live-backports.bootstrap	2007-05-26 10:17:22 UTC (rev 1771)
@@ -0,0 +1,11 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Live Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. live-backports.bootstrap and once as live-backports.binary.
+##
+## Remeber to add debian-unofficial-archive-keyring to your package selection.
+
+# Debian Live backports for Etch
+deb http://live.debian.net/debian/ etch main
+deb-src http://live.debian.net/debian/ etch main

Added: configs/daniel-test/config/chroot_sources/live-backports.bootstrap.gpg
===================================================================
--- configs/daniel-test/config/chroot_sources/live-backports.bootstrap.gpg	                        (rev 0)
+++ configs/daniel-test/config/chroot_sources/live-backports.bootstrap.gpg	2007-05-26 10:17:22 UTC (rev 1771)
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEW3mTQRBACGTYsPYYtzKpjTBcuDOMyF48fcNkW069tXst8/aS1SM4Elw7j4
+sdkwTc6PCV1WBJuZObEAmsGJRyWfMVniux6HJiEjZLehyzfGPHjPaqnPeHomoTa2
+EpKT0AtqhUW2RVsGSPcx5E0w+71GOd4Rl1Dxc3kS0wqHYHfzcPsDq4xn1wCg2oV5
+oyuxyI3W4ep0uFDe1X0Du7kD/0TrkT9hsinfCga9vJ+R1Yslz9fEvRm1WvdTUW3k
+rEJs3gVIuNMF4a9SikXkBngquQA4iuj/rghFkBKexEZm52a486vZgkR5q0BD8+c/
+Ua6plRNQPdUMusymWHXnPw8Hxyt/+g21U3eCSIcktSR8kX1+dsp5MKw+Dh6wdRSb
+FOsVA/9BS4ANC0S02UzbR4Qsxutde0P0+2hUJJCfB1877p6W2vWp2UVQu11YLIfM
+sgYJjUAlMVcBFBJI1BHkK0vx2xK4w3/s9RiFa2aeY+ZGfoA6qLeKXbHHUEvj37c/
+k9Gh6MqgxUHE21X5z8GuHPRbiL+kZJt59DL5EwO+viWuEVuUZLRYRGViaWFuIFVu
+b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDcpIDxm
+dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJFt5k0AhsD
+BQkB67+ABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQOU0ZlSTFKsOXdQCfeRoG
+HjLLQmYPM8iP1/7WyEY9uaEAnApx8isAZY0rlL13vx++lPF+M9reiEYEEBECAAYF
+AkW3mU8ACgkQ+C5cwEsrK56jCQCghT9KL/I1G6nUw+9bYr1qjQWVDzgAn3KUtyE/
+uc4k+zApv632x2susVIq
+=BzDd
+-----END PGP PUBLIC KEY BLOCK-----

Modified: configs/daniel-test/config/common
===================================================================
--- configs/daniel-test/config/common	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-test/config/common	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,9 +1,5 @@
-# config/common: configuration for live-helper(7)
+# config/common - common options for live-helper(7)
 
-# $LH_MODE: set distribution mode
-# (Default: debian)
-LH_MODE="debian"
-
 # $LH_APT: set package manager
 # (Default: aptitude)
 LH_APT="aptitude"
@@ -16,67 +12,71 @@
 # (Default: autodetected or empty)
 LH_APT_HTTPPROXY=""
 
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
-LH_BINARY_INDICES="disabled"
-
 # $LH_APT_PDIFFS: set apt/aptitude pdiff indices
 # (Default: enabled)
-LH_APT_PDIFFS="disabled"
+LH_APT_PDIFFS="enabled"
 
-# $LH_APT_RECOMMENDS: enable recommends
+# $LH_APT_RECOMMENDS: set apt/aptitude recommends
 # (Default: enabled)
 LH_APT_RECOMMENDS="disabled"
 
-# $LH_APT_SECURE: enable secure
+# $LH_APT_SECURE: set apt/aptitude security
 # (Default: enabled)
 LH_APT_SECURE="enabled"
 
-# $LH_BOOTSTRAP: select the bootstrap program
+# $LH_BOOTSTRAP: set bootstrap program
 # (Default: cdebootstrap)
 LH_BOOTSTRAP="cdebootstrap"
 
-# $LH_CACHE_INDICES: control if downloaded packages should be cached
+# $LH_CACHE_INDICES: control if downloaded package indices should be cached
 # (Default: disabled)
 LH_CACHE_INDICES="disabled"
 
-# $LH_CACHE_PACKAGES: control if downloaded packages should be cached
+# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
 # (Default: enabled)
-LH_CACHE_PACKAGES="disabled"
+LH_CACHE_PACKAGES="enabled"
 
-# $LH_CACHE_STAGES: control if downloaded packages should be cached
+# $LH_CACHE_STAGES: control if completed stages should be cached
 # (Default: bootstrap)
 LH_CACHE_STAGES="bootstrap"
 
-# $LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
+# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
 # (Default: noninteractive)
 LH_DEBCONF_FRONTEND="noninteractive"
 
-# $LH_DEBCONF_PRIORITY: set the debconf(1) priority to use
-# (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
+# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: critical)
+LH_DEBCONF_PRIORITY="critical"
+
+# $LH_GENISOIMAGE: set genisoimage program
 # (Default: genisoimage)
 LH_GENISOIMAGE="genisoimage"
 
-# $LH_LOSETUP: set the losetup program
+# $LH_INITRAMFS: set initramfs hook
+# (Default: live-initramfs)
+LH_INITRAMFS="live-initramfs"
+
+# $LH_LOSETUP: set losetup program
 # (Default: autodetected)
 LH_LOSETUP="losetup"
 
-# $LH_TASKSEL: set the tasksel program
+# $LH_MODE: set distribution mode
+# (Default: debian)
+LH_MODE="debian"
+
+# $LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# $LH_TASKSEL: set tasksel program
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LH_INITRAMFS: set the initramfs generator
-# (Default: casper)
-LH_INITRAMFS="live-initramfs"
-
-# $LIVE_ROOT: set the root directory
+# $LIVE_ROOT: set root directory
 # (Default: debian-live)
 LIVE_ROOT="debian-live"
 
@@ -90,10 +90,6 @@
 
 # Live-helper options
 
-# $LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
 # $LH_BREAKPOINTS: enable breakpoints
 # (Default: disabled)
 #LH_BREAKPOINTS="disabled"

Modified: configs/daniel-test/config/source
===================================================================
--- configs/daniel-test/config/source	2007-05-26 10:08:48 UTC (rev 1770)
+++ configs/daniel-test/config/source	2007-05-26 10:17:22 UTC (rev 1771)
@@ -1,9 +1,9 @@
-# config/chroot: configuration for lh_source_*
+# config/source - options for live-helper(7), source stage
 
 # $LIVE_SOURCE: set source option
 # (Default: )
 LIVE_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGE: set image type
+# $LIVE_SOURCE_IMAGES: set image type
 # (Default: generic)
 LIVE_SOURCE_IMAGES="generic"




More information about the Debian-live-changes mailing list