r2865 - configs/gnome-junior/config
synrg at alioth.debian.org
synrg at alioth.debian.org
Mon Sep 17 11:27:07 UTC 2007
Author: synrg
Date: 2007-09-17 11:27:07 +0000 (Mon, 17 Sep 2007)
New Revision: 2865
Modified:
configs/gnome-junior/config/bootstrap
configs/gnome-junior/config/chroot
configs/gnome-junior/config/common
Log:
Updated to work with current live-helper
Modified: configs/gnome-junior/config/bootstrap
===================================================================
--- configs/gnome-junior/config/bootstrap 2007-09-17 10:28:31 UTC (rev 2864)
+++ configs/gnome-junior/config/bootstrap 2007-09-17 11:27:07 UTC (rev 2865)
@@ -1,37 +1,41 @@
-# config/bootstrap: configuration for lh_bootstrap_*
+# config/bootstrap - options for live-helper(7), bootstrap stage
-# $LIVE_ARCHITECTURE: select the chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
# (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
-# $LIVE_DISTRIBUTION: select the distribution to use
-# (Default: sid)
-LIVE_DISTRIBUTION="sid"
-
-# $LIVE_DISTRIBUTION_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
# (Default: empty)
-LIVE_DISTRIBUTION_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
-# $LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
# (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
-# $LIVE_MIRROR_BUILD: set the mirror to fetch packages from
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LH_BOOTSTRAP_KEYRING=""
+
+# $LH_DISTRIBUTION: select distribution to use
+# (Default: lenny)
+LH_DISTRIBUTION="lenny"
+
+# $LH_MIRROR_BOOTSTRAP: set mirror to fetch packages from
# (Default: http://ftp.debian.org/debian/)
-LIVE_MIRROR_BUILD="http://ftp.debian.org/debian/"
+LH_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
-# $LIVE_MIRROR_BUILD_SECURITY: set the security mirror to fetch packages from
+# $LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
# (Default: http://security.debian.org/)
-LIVE_MIRROR_BUILD_SECURITY="http://security.debian.org/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
-# $LIVE_MIRROR_IMAGE: set the mirror which ends up in the image
+# $LH_MIRROR_BINARY: set mirror which ends up in the image
# (Default: http://ftp.debian.org/debian/)
-LIVE_MIRROR_IMAGE="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
-# $LIVE_MIRROR_IMAGE_SECURITY: set the security mirror which ends up in the image
+# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
# (Default: http://security.debian.org/)
-LIVE_MIRROR_IMAGE_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
-# $LIVE_SECTIONS: select the section(s) to use
+# $LH_SECTIONS: select section(s) to use
# (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"
Modified: configs/gnome-junior/config/chroot
===================================================================
--- configs/gnome-junior/config/chroot 2007-09-17 10:28:31 UTC (rev 2864)
+++ configs/gnome-junior/config/chroot 2007-09-17 11:27:07 UTC (rev 2865)
@@ -1,49 +1,57 @@
-# config/chroot: configuration for lh_chroot_*
+# config/chroot - options for live-helper(7), chroot stage
-# $LIVE_KERNEL_FLAVOUR: set the kernel flavour to use
-# (Default: autodetected)
-LIVE_KERNEL_FLAVOUR="486"
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: squashfs)
+LH_CHROOT_FILESYSTEM="squashfs"
-# $LIVE_KERNEL_PACKAGES: set the kernel packages to use
-# (Default: autodetected)
-LIVE_KERNEL_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+# $LH_UNION_FILESYSTEM: set union filesystem
+# (Default: unionfs
+LH_UNION_FILESYSTEM="unionfs"
-# $LIVE_KEYRING_PACKAGES: set the keyring packages
+# $LH_HOOKS: set hook commands
# (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_HOOKS=""
-# $LIVE_HOOKS: set hook commands
+# $LH_INTERACTIVE: set interactive build
+# (Default: disabled)
+LH_INTERACTIVE="disabled"
+
+# $LH_KEYRING_PACKAGES: set keyring packages
# (Default: empty)
-LIVE_HOOKS=""
+LH_KEYRING_PACKAGES=""
-# $LIVE_LANGUAGE: set the language to use
+# $LH_LANGUAGE: set language to use
# (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
-# $LIVE_PACKAGES: set the packages to install
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+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_PACKAGES: set packages to install
# (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
-# $LIVE_PACKAGES_LISTS: set the package list to install
+# $LH_PACKAGES_LISTS: set package list to install
# (Default: gnome-junior)
-LIVE_PACKAGES_LISTS="gnome-junior"
+LH_PACKAGES_LISTS="gnome-junior"
-# $LIVE_TASKS: set the tasks to install
+# $LH_TASKS: set tasks to install
# (Default: empty)
-LIVE_TASKS=""
+LH_TASKS=""
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
# (Default: enabled)
-LIVE_SECURITY="enabled"
+LH_SECURITY="enabled"
-# $LIVE_SYMLINKS: enable symlink convertion
+# $LH_SYMLINKS: enable symlink convertion
# (Default: disabled)
-LIVE_SYMLINKS="disabled"
+LH_SYMLINKS="disabled"
-# $LIVE_SYSVINIT: enable sysvinit
+# $LH_SYSVINIT: enable sysvinit
# (Default: disabled)
-LIVE_SYSVINIT="disabled"
-
-# $LIVE_INTERACTIVE: set interactive build
-# (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_SYSVINIT="disabled"
Modified: configs/gnome-junior/config/common
===================================================================
--- configs/gnome-junior/config/common 2007-09-17 10:28:31 UTC (rev 2864)
+++ configs/gnome-junior/config/common 2007-09-17 11:27:07 UTC (rev 2865)
@@ -1,91 +1,115 @@
-# 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"
+# (Default: apt-get)
+LH_APT="apt-get"
-# $LH_APT_FTPPROXY: set apt/aptitude ftp proxy
+# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
# (Default: autodetected or empty)
-LH_APT_FTPPROXY=""
+LH_APT_FTP_PROXY=""
-# $LH_APT_HTTPPROXY: set apt/aptitude http proxy
+# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
# (Default: autodetected or empty)
-LH_APT_HTTPPROXY=""
+LH_APT_HTTP_PROXY=""
-# $LH_APT_GENERIC: set apt/aptitude generic indices
-# (Default: enabled)
-LH_APT_GENERIC="enabled"
-
# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
# (Default: enabled)
LH_APT_PDIFFS="enabled"
-# $LH_APT_RECOMMENDS: enable recommends
+# $LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: )
+LH_APT_PIPELINE=""
+
+# $LH_APT_RECOMMENDS: set apt/aptitude recommends
# (Default: 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: control if downloaded packages should be cached
+# $LH_CACHE: control cache
# (Default: enabled)
LH_CACHE="enabled"
-# $LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
+# $LH_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: disabled)
+LH_CACHE_INDICES="disabled"
+
+# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: enabled)
+LH_CACHE_PACKAGES="enabled"
+
+# $LH_CACHE_STAGES: control if completed stages should be cached
+# (Default: bootstrap)
+LH_CACHE_STAGES="bootstrap"
+
+# $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"
-# $LIVE_ROOT: set the root directory
-# (Default: junior)
-LIVE_ROOT="junior"
+# $LH_INCLUDES: set includes
+# (Default: /usr/share/live-helper/includes)
+LH_INCLUDES="/usr/share/live-helper/includes"
+# $LH_TEMPLATES: set templates
+# (Default: /usr/share/live-helper/templates)
+LH_TEMPLATES="/usr/share/live-helper/templates"
+
# Live-helper options
# $LH_BREAKPOINTS: enable breakpoints
# (Default: disabled)
-LH_BREAKPOINTS="disabled"
+#LH_BREAKPOINTS="disabled"
# $LH_DEBUG: enable debug
# (Default: disabled)
-LH_DEBUG="disabled"
+#LH_DEBUG="disabled"
# $LH_FORCE: enable force
# (Default: disabled)
-LH_FORCE="disabled"
+#LH_FORCE="disabled"
# $LH_QUIET: enable quiet
# (Default: disabled)
-LH_QUIET="disabled"
+#LH_QUIET="disabled"
# $LH_VERBOSE: enable verbose
# (Default: disabled)
-LH_VERBOSE="disabled"
+#LH_VERBOSE="disabled"
More information about the debian-live-changes
mailing list