r2672 - in configs/etch: amd64-gnome-CD/config amd64-gnome-USB/config amd64-kde-CD/config amd64-kde-USB/config amd64-standard-CD/config amd64-standard-USB/config amd64-xfce-CD/config amd64-xfce-USB/config i386-gnome-CD/config i386-gnome-USB/config i386-kde-CD/config i386-kde-USB/config i386-standard-CD/config i386-standard-USB/config i386-xfce-CD/config i386-xfce-USB/config powerpc-gnome-CD/config powerpc-gnome-USB/config powerpc-kde-CD/config powerpc-kde-USB/config powerpc-standard-CD/config powerpc-standard-USB/config powerpc-xfce-CD/config powerpc-xfce-USB/config

daniel at alioth.debian.org daniel at alioth.debian.org
Sat Aug 4 13:25:36 UTC 2007


Author: daniel
Date: 2007-08-04 13:25:35 +0000 (Sat, 04 Aug 2007)
New Revision: 2672

Modified:
   configs/etch/amd64-gnome-CD/config/binary
   configs/etch/amd64-gnome-CD/config/bootstrap
   configs/etch/amd64-gnome-CD/config/chroot
   configs/etch/amd64-gnome-CD/config/common
   configs/etch/amd64-gnome-CD/config/source
   configs/etch/amd64-gnome-USB/config/binary
   configs/etch/amd64-gnome-USB/config/bootstrap
   configs/etch/amd64-gnome-USB/config/chroot
   configs/etch/amd64-gnome-USB/config/common
   configs/etch/amd64-gnome-USB/config/source
   configs/etch/amd64-kde-CD/config/binary
   configs/etch/amd64-kde-CD/config/bootstrap
   configs/etch/amd64-kde-CD/config/chroot
   configs/etch/amd64-kde-CD/config/common
   configs/etch/amd64-kde-CD/config/source
   configs/etch/amd64-kde-USB/config/binary
   configs/etch/amd64-kde-USB/config/bootstrap
   configs/etch/amd64-kde-USB/config/chroot
   configs/etch/amd64-kde-USB/config/common
   configs/etch/amd64-kde-USB/config/source
   configs/etch/amd64-standard-CD/config/binary
   configs/etch/amd64-standard-CD/config/bootstrap
   configs/etch/amd64-standard-CD/config/chroot
   configs/etch/amd64-standard-CD/config/common
   configs/etch/amd64-standard-CD/config/source
   configs/etch/amd64-standard-USB/config/binary
   configs/etch/amd64-standard-USB/config/bootstrap
   configs/etch/amd64-standard-USB/config/chroot
   configs/etch/amd64-standard-USB/config/common
   configs/etch/amd64-standard-USB/config/source
   configs/etch/amd64-xfce-CD/config/binary
   configs/etch/amd64-xfce-CD/config/bootstrap
   configs/etch/amd64-xfce-CD/config/chroot
   configs/etch/amd64-xfce-CD/config/common
   configs/etch/amd64-xfce-CD/config/source
   configs/etch/amd64-xfce-USB/config/binary
   configs/etch/amd64-xfce-USB/config/bootstrap
   configs/etch/amd64-xfce-USB/config/chroot
   configs/etch/amd64-xfce-USB/config/common
   configs/etch/amd64-xfce-USB/config/source
   configs/etch/i386-gnome-CD/config/binary
   configs/etch/i386-gnome-CD/config/bootstrap
   configs/etch/i386-gnome-CD/config/chroot
   configs/etch/i386-gnome-CD/config/common
   configs/etch/i386-gnome-CD/config/source
   configs/etch/i386-gnome-USB/config/binary
   configs/etch/i386-gnome-USB/config/bootstrap
   configs/etch/i386-gnome-USB/config/chroot
   configs/etch/i386-gnome-USB/config/common
   configs/etch/i386-gnome-USB/config/source
   configs/etch/i386-kde-CD/config/binary
   configs/etch/i386-kde-CD/config/bootstrap
   configs/etch/i386-kde-CD/config/chroot
   configs/etch/i386-kde-CD/config/common
   configs/etch/i386-kde-CD/config/source
   configs/etch/i386-kde-USB/config/binary
   configs/etch/i386-kde-USB/config/bootstrap
   configs/etch/i386-kde-USB/config/chroot
   configs/etch/i386-kde-USB/config/common
   configs/etch/i386-kde-USB/config/source
   configs/etch/i386-standard-CD/config/binary
   configs/etch/i386-standard-CD/config/bootstrap
   configs/etch/i386-standard-CD/config/chroot
   configs/etch/i386-standard-CD/config/common
   configs/etch/i386-standard-CD/config/source
   configs/etch/i386-standard-USB/config/binary
   configs/etch/i386-standard-USB/config/bootstrap
   configs/etch/i386-standard-USB/config/chroot
   configs/etch/i386-standard-USB/config/common
   configs/etch/i386-standard-USB/config/source
   configs/etch/i386-xfce-CD/config/binary
   configs/etch/i386-xfce-CD/config/bootstrap
   configs/etch/i386-xfce-CD/config/chroot
   configs/etch/i386-xfce-CD/config/common
   configs/etch/i386-xfce-CD/config/source
   configs/etch/i386-xfce-USB/config/binary
   configs/etch/i386-xfce-USB/config/bootstrap
   configs/etch/i386-xfce-USB/config/chroot
   configs/etch/i386-xfce-USB/config/common
   configs/etch/i386-xfce-USB/config/source
   configs/etch/powerpc-gnome-CD/config/binary
   configs/etch/powerpc-gnome-CD/config/bootstrap
   configs/etch/powerpc-gnome-CD/config/chroot
   configs/etch/powerpc-gnome-CD/config/common
   configs/etch/powerpc-gnome-CD/config/source
   configs/etch/powerpc-gnome-USB/config/binary
   configs/etch/powerpc-gnome-USB/config/bootstrap
   configs/etch/powerpc-gnome-USB/config/chroot
   configs/etch/powerpc-gnome-USB/config/common
   configs/etch/powerpc-gnome-USB/config/source
   configs/etch/powerpc-kde-CD/config/binary
   configs/etch/powerpc-kde-CD/config/bootstrap
   configs/etch/powerpc-kde-CD/config/chroot
   configs/etch/powerpc-kde-CD/config/common
   configs/etch/powerpc-kde-CD/config/source
   configs/etch/powerpc-kde-USB/config/binary
   configs/etch/powerpc-kde-USB/config/bootstrap
   configs/etch/powerpc-kde-USB/config/chroot
   configs/etch/powerpc-kde-USB/config/common
   configs/etch/powerpc-kde-USB/config/source
   configs/etch/powerpc-standard-CD/config/binary
   configs/etch/powerpc-standard-CD/config/bootstrap
   configs/etch/powerpc-standard-CD/config/chroot
   configs/etch/powerpc-standard-CD/config/common
   configs/etch/powerpc-standard-CD/config/source
   configs/etch/powerpc-standard-USB/config/binary
   configs/etch/powerpc-standard-USB/config/bootstrap
   configs/etch/powerpc-standard-USB/config/chroot
   configs/etch/powerpc-standard-USB/config/common
   configs/etch/powerpc-standard-USB/config/source
   configs/etch/powerpc-xfce-CD/config/binary
   configs/etch/powerpc-xfce-CD/config/bootstrap
   configs/etch/powerpc-xfce-CD/config/chroot
   configs/etch/powerpc-xfce-CD/config/common
   configs/etch/powerpc-xfce-CD/config/source
   configs/etch/powerpc-xfce-USB/config/binary
   configs/etch/powerpc-xfce-USB/config/bootstrap
   configs/etch/powerpc-xfce-USB/config/chroot
   configs/etch/powerpc-xfce-USB/config/common
   configs/etch/powerpc-xfce-USB/config/source
Log:


Modified: configs/etch/amd64-gnome-CD/config/binary
===================================================================
--- configs/etch/amd64-gnome-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-gnome-CD/config/bootstrap
===================================================================
--- configs/etch/amd64-gnome-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-gnome-CD/config/chroot
===================================================================
--- configs/etch/amd64-gnome-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop gnome-desktop desktop"
+LH_TASKS="standard laptop gnome-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-gnome-CD/config/common
===================================================================
--- configs/etch/amd64-gnome-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-gnome-CD/config/source
===================================================================
--- configs/etch/amd64-gnome-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-gnome-USB/config/binary
===================================================================
--- configs/etch/amd64-gnome-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-gnome-USB/config/bootstrap
===================================================================
--- configs/etch/amd64-gnome-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-gnome-USB/config/chroot
===================================================================
--- configs/etch/amd64-gnome-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop gnome-desktop desktop"
+LH_TASKS="standard laptop gnome-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-gnome-USB/config/common
===================================================================
--- configs/etch/amd64-gnome-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-gnome-USB/config/source
===================================================================
--- configs/etch/amd64-gnome-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-gnome-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-kde-CD/config/binary
===================================================================
--- configs/etch/amd64-kde-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-kde-CD/config/bootstrap
===================================================================
--- configs/etch/amd64-kde-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-kde-CD/config/chroot
===================================================================
--- configs/etch/amd64-kde-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop kde-desktop desktop"
+LH_TASKS="standard laptop kde-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-kde-CD/config/common
===================================================================
--- configs/etch/amd64-kde-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-kde-CD/config/source
===================================================================
--- configs/etch/amd64-kde-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-kde-USB/config/binary
===================================================================
--- configs/etch/amd64-kde-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-kde-USB/config/bootstrap
===================================================================
--- configs/etch/amd64-kde-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-kde-USB/config/chroot
===================================================================
--- configs/etch/amd64-kde-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop kde-desktop desktop"
+LH_TASKS="standard laptop kde-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-kde-USB/config/common
===================================================================
--- configs/etch/amd64-kde-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-kde-USB/config/source
===================================================================
--- configs/etch/amd64-kde-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-kde-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-standard-CD/config/binary
===================================================================
--- configs/etch/amd64-standard-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-standard-CD/config/bootstrap
===================================================================
--- configs/etch/amd64-standard-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-standard-CD/config/chroot
===================================================================
--- configs/etch/amd64-standard-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard"
+LH_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard"
+LH_TASKS="standard"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-standard-CD/config/common
===================================================================
--- configs/etch/amd64-standard-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-standard-CD/config/source
===================================================================
--- configs/etch/amd64-standard-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-standard-USB/config/binary
===================================================================
--- configs/etch/amd64-standard-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-standard-USB/config/bootstrap
===================================================================
--- configs/etch/amd64-standard-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-standard-USB/config/chroot
===================================================================
--- configs/etch/amd64-standard-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard"
+LH_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard"
+LH_TASKS="standard"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-standard-USB/config/common
===================================================================
--- configs/etch/amd64-standard-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-standard-USB/config/source
===================================================================
--- configs/etch/amd64-standard-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-standard-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-xfce-CD/config/binary
===================================================================
--- configs/etch/amd64-xfce-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-xfce-CD/config/bootstrap
===================================================================
--- configs/etch/amd64-xfce-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-xfce-CD/config/chroot
===================================================================
--- configs/etch/amd64-xfce-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop xfce-desktop desktop"
+LH_TASKS="standard laptop xfce-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-xfce-CD/config/common
===================================================================
--- configs/etch/amd64-xfce-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-xfce-CD/config/source
===================================================================
--- configs/etch/amd64-xfce-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/amd64-xfce-USB/config/binary
===================================================================
--- configs/etch/amd64-xfce-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/amd64-xfce-USB/config/bootstrap
===================================================================
--- configs/etch/amd64-xfce-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="amd64"
+LH_ARCHITECTURE="amd64"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/amd64-xfce-USB/config/chroot
===================================================================
--- configs/etch/amd64-xfce-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="amd64"
+LH_LINUX_FLAVOURS="amd64"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop xfce-desktop desktop"
+LH_TASKS="standard laptop xfce-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/amd64-xfce-USB/config/common
===================================================================
--- configs/etch/amd64-xfce-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/amd64-xfce-USB/config/source
===================================================================
--- configs/etch/amd64-xfce-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/amd64-xfce-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-gnome-CD/config/binary
===================================================================
--- configs/etch/i386-gnome-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-gnome-CD/config/bootstrap
===================================================================
--- configs/etch/i386-gnome-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-gnome-CD/config/chroot
===================================================================
--- configs/etch/i386-gnome-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop gnome-desktop desktop"
+LH_TASKS="standard laptop gnome-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-gnome-CD/config/common
===================================================================
--- configs/etch/i386-gnome-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-gnome-CD/config/source
===================================================================
--- configs/etch/i386-gnome-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-gnome-USB/config/binary
===================================================================
--- configs/etch/i386-gnome-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-gnome-USB/config/bootstrap
===================================================================
--- configs/etch/i386-gnome-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-gnome-USB/config/chroot
===================================================================
--- configs/etch/i386-gnome-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop gnome-desktop desktop"
+LH_TASKS="standard laptop gnome-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-gnome-USB/config/common
===================================================================
--- configs/etch/i386-gnome-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-gnome-USB/config/source
===================================================================
--- configs/etch/i386-gnome-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-gnome-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-kde-CD/config/binary
===================================================================
--- configs/etch/i386-kde-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-kde-CD/config/bootstrap
===================================================================
--- configs/etch/i386-kde-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-kde-CD/config/chroot
===================================================================
--- configs/etch/i386-kde-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop kde-desktop desktop"
+LH_TASKS="standard laptop kde-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-kde-CD/config/common
===================================================================
--- configs/etch/i386-kde-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-kde-CD/config/source
===================================================================
--- configs/etch/i386-kde-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-kde-USB/config/binary
===================================================================
--- configs/etch/i386-kde-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-kde-USB/config/bootstrap
===================================================================
--- configs/etch/i386-kde-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-kde-USB/config/chroot
===================================================================
--- configs/etch/i386-kde-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop kde-desktop desktop"
+LH_TASKS="standard laptop kde-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-kde-USB/config/common
===================================================================
--- configs/etch/i386-kde-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-kde-USB/config/source
===================================================================
--- configs/etch/i386-kde-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-kde-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-standard-CD/config/binary
===================================================================
--- configs/etch/i386-standard-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-standard-CD/config/bootstrap
===================================================================
--- configs/etch/i386-standard-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-standard-CD/config/chroot
===================================================================
--- configs/etch/i386-standard-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard"
+LH_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard"
+LH_TASKS="standard"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-standard-CD/config/common
===================================================================
--- configs/etch/i386-standard-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-standard-CD/config/source
===================================================================
--- configs/etch/i386-standard-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-standard-USB/config/binary
===================================================================
--- configs/etch/i386-standard-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-standard-USB/config/bootstrap
===================================================================
--- configs/etch/i386-standard-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-standard-USB/config/chroot
===================================================================
--- configs/etch/i386-standard-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard"
+LH_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard"
+LH_TASKS="standard"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-standard-USB/config/common
===================================================================
--- configs/etch/i386-standard-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-standard-USB/config/source
===================================================================
--- configs/etch/i386-standard-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-standard-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-xfce-CD/config/binary
===================================================================
--- configs/etch/i386-xfce-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-xfce-CD/config/bootstrap
===================================================================
--- configs/etch/i386-xfce-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-xfce-CD/config/chroot
===================================================================
--- configs/etch/i386-xfce-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop xfce-desktop desktop"
+LH_TASKS="standard laptop xfce-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-xfce-CD/config/common
===================================================================
--- configs/etch/i386-xfce-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-xfce-CD/config/source
===================================================================
--- configs/etch/i386-xfce-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/i386-xfce-USB/config/binary
===================================================================
--- configs/etch/i386-xfce-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="syslinux"
+LH_BOOTLOADER="syslinux"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="memtest86+"
+LH_MEMTEST="memtest86+"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/i386-xfce-USB/config/bootstrap
===================================================================
--- configs/etch/i386-xfce-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/i386-xfce-USB/config/chroot
===================================================================
--- configs/etch/i386-xfce-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop xfce-desktop desktop"
+LH_TASKS="standard laptop xfce-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/i386-xfce-USB/config/common
===================================================================
--- configs/etch/i386-xfce-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/i386-xfce-USB/config/source
===================================================================
--- configs/etch/i386-xfce-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/i386-xfce-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-gnome-CD/config/binary
===================================================================
--- configs/etch/powerpc-gnome-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-gnome-CD/config/bootstrap
===================================================================
--- configs/etch/powerpc-gnome-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-gnome-CD/config/chroot
===================================================================
--- configs/etch/powerpc-gnome-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop gnome-desktop desktop"
+LH_TASKS="standard laptop gnome-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-gnome-CD/config/common
===================================================================
--- configs/etch/powerpc-gnome-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-gnome-CD/config/source
===================================================================
--- configs/etch/powerpc-gnome-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-gnome-USB/config/binary
===================================================================
--- configs/etch/powerpc-gnome-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-gnome-USB/config/bootstrap
===================================================================
--- configs/etch/powerpc-gnome-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-gnome-USB/config/chroot
===================================================================
--- configs/etch/powerpc-gnome-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop gnome-desktop desktop"
+LH_TASKS="standard laptop gnome-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-gnome-USB/config/common
===================================================================
--- configs/etch/powerpc-gnome-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-gnome-USB/config/source
===================================================================
--- configs/etch/powerpc-gnome-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-gnome-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-kde-CD/config/binary
===================================================================
--- configs/etch/powerpc-kde-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-kde-CD/config/bootstrap
===================================================================
--- configs/etch/powerpc-kde-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-kde-CD/config/chroot
===================================================================
--- configs/etch/powerpc-kde-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop kde-desktop desktop"
+LH_TASKS="standard laptop kde-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-kde-CD/config/common
===================================================================
--- configs/etch/powerpc-kde-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-kde-CD/config/source
===================================================================
--- configs/etch/powerpc-kde-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-kde-USB/config/binary
===================================================================
--- configs/etch/powerpc-kde-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-kde-USB/config/bootstrap
===================================================================
--- configs/etch/powerpc-kde-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-kde-USB/config/chroot
===================================================================
--- configs/etch/powerpc-kde-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop kde-desktop desktop"
+LH_TASKS="standard laptop kde-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-kde-USB/config/common
===================================================================
--- configs/etch/powerpc-kde-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-kde-USB/config/source
===================================================================
--- configs/etch/powerpc-kde-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-kde-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-standard-CD/config/binary
===================================================================
--- configs/etch/powerpc-standard-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-standard-CD/config/bootstrap
===================================================================
--- configs/etch/powerpc-standard-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-standard-CD/config/chroot
===================================================================
--- configs/etch/powerpc-standard-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard"
+LH_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard"
+LH_TASKS="standard"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-standard-CD/config/common
===================================================================
--- configs/etch/powerpc-standard-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-standard-CD/config/source
===================================================================
--- configs/etch/powerpc-standard-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-standard-USB/config/binary
===================================================================
--- configs/etch/powerpc-standard-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-standard-USB/config/bootstrap
===================================================================
--- configs/etch/powerpc-standard-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-standard-USB/config/chroot
===================================================================
--- configs/etch/powerpc-standard-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard"
+LH_PACKAGES_LISTS="standard"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard"
+LH_TASKS="standard"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-standard-USB/config/common
===================================================================
--- configs/etch/powerpc-standard-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-standard-USB/config/source
===================================================================
--- configs/etch/powerpc-standard-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-standard-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-xfce-CD/config/binary
===================================================================
--- configs/etch/powerpc-xfce-CD/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-CD/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="iso"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-xfce-CD/config/bootstrap
===================================================================
--- configs/etch/powerpc-xfce-CD/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-CD/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-xfce-CD/config/chroot
===================================================================
--- configs/etch/powerpc-xfce-CD/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-CD/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop xfce-desktop desktop"
+LH_TASKS="standard laptop xfce-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-xfce-CD/config/common
===================================================================
--- configs/etch/powerpc-xfce-CD/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-CD/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-xfce-CD/config/source
===================================================================
--- configs/etch/powerpc-xfce-CD/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-CD/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="enabled"
+LH_SOURCE="enabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"

Modified: configs/etch/powerpc-xfce-USB/config/binary
===================================================================
--- configs/etch/powerpc-xfce-USB/config/binary	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-USB/config/binary	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,74 +1,74 @@
 # config/binary - options for live-helper(7), binary stage
 
-# $LIVE_BINARY_IMAGES: set image type
+# $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
-# $LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LIVE_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
 
-# $LIVE_BOOTAPPEND: set boot parameters
+# $LH_BOOTAPPEND: set boot parameters
 # (Default: empty)
-LIVE_BOOTAPPEND=""
+LH_BOOTAPPEND=""
 
-# $LIVE_BOOTLOADER: set bootloader
+# $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LIVE_BOOTLOADER="yaboot"
+LH_BOOTLOADER="yaboot"
 
-# $LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# $LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="enabled"
+LH_CHROOT_BUILD="enabled"
 
-# $LIVE_DEBIAN_INSTALLER: set debian-installer
+# $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-LIVE_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="disabled"
 
-# $LIVE_ENCRYPTION: set encrytion
+# $LH_ENCRYPTION: set encrytion
 # (Default: empty)
-LIVE_ENCRYPTION=""
+LH_ENCRYPTION=""
 
-# $LIVE_GRUB_SPLASH: set custom grub splash
+# $LH_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LIVE_GRUB_SPLASH=""
+LH_GRUB_SPLASH=""
 
-# $LIVE_HOSTNAME: set hostname
+# $LH_HOSTNAME: set hostname
 # (Default: debian)
-LIVE_HOSTNAME="debian"
+LH_HOSTNAME="debian"
 
-# $LIVE_ISO_APPLICATION: set iso author
+# $LH_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LIVE_ISO_APPLICATION="Debian Live"
+LH_ISO_APPLICATION="Debian Live"
 
-# $LIVE_ISO_PREPARER: set iso preparer
+# $LH_ISO_PREPARER: set iso preparer
 # (Default: live-helper 1.0~a17; http://packages.qa.debian.org/live-helper)
-LIVE_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
+LH_ISO_PREPARER="live-helper 1.0~a17; http://packages.qa.debian.org/live-helper"
 
-# $LIVE_ISO_PUBLISHER: set iso preparer
+# $LH_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"
+LH_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 (max 32 chars)
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
+LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
 
-# $LIVE_MEMTEST: set memtest
+# $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-LIVE_MEMTEST="none"
+LH_MEMTEST="none"
 
-# $LIVE_NET_PATH: set netboot server directory
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LIVE_NET_PATH="/srv/debian-live"
+LH_NET_PATH="/srv/debian-live"
 
-# $LIVE_NET_SERVER: set netboot server address
+# $LH_NET_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LIVE_NET_SERVER="192.168.1.1"
+LH_NET_SERVER="192.168.1.1"
 
-# $LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LIVE_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH=""
 
-# $LIVE_USERNAME: set username
+# $LH_USERNAME: set username
 # (Default: user)
-LIVE_USERNAME="user"
+LH_USERNAME="user"

Modified: configs/etch/powerpc-xfce-USB/config/bootstrap
===================================================================
--- configs/etch/powerpc-xfce-USB/config/bootstrap	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-USB/config/bootstrap	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,41 +1,41 @@
 # config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LIVE_ARCHITECTURE: select chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LIVE_ARCHITECTURE="powerpc"
+LH_ARCHITECTURE="powerpc"
 
-# $LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LIVE_BOOTSTRAP_CONFIG=""
+LH_BOOTSTRAP_CONFIG=""
 
-# $LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-LIVE_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="standard"
 
-# $LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LIVE_BOOTSTRAP_KEYRING=""
+LH_BOOTSTRAP_KEYRING=""
 
-# $LIVE_DISTRIBUTION: select distribution to use
+# $LH_DISTRIBUTION: select distribution to use
 # (Default: etch)
-LIVE_DISTRIBUTION="etch"
+LH_DISTRIBUTION="etch"
 
-# $LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
 
-# $LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_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/"
+LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
 
-# $LIVE_MIRROR_BINARY: set 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_BINARY="http://ftp.de.debian.org/debian/"
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
 
-# $LIVE_MIRROR_BINARY_SECURITY: set 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_BINARY_SECURITY="http://security.debian.org/"
+LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LIVE_SECTIONS: select section(s) to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LIVE_SECTIONS="main"
+LH_SECTIONS="main"

Modified: configs/etch/powerpc-xfce-USB/config/chroot
===================================================================
--- configs/etch/powerpc-xfce-USB/config/chroot	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-USB/config/chroot	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,53 +1,53 @@
 # config/chroot - options for live-helper(7), chroot stage
 
-# $LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LIVE_CHROOT_FILESYSTEM="squashfs"
+LH_CHROOT_FILESYSTEM="squashfs"
 
-# $LIVE_HOOKS: set hook commands
+# $LH_HOOKS: set hook commands
 # (Default: empty)
-LIVE_HOOKS=""
+LH_HOOKS=""
 
-# $LIVE_INTERACTIVE: set interactive build
+# $LH_INTERACTIVE: set interactive build
 # (Default: disabled)
-LIVE_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
 
-# $LIVE_KEYRING_PACKAGES: set keyring packages
+# $LH_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LIVE_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES=""
 
-# $LIVE_LANGUAGE: set language to use
+# $LH_LANGUAGE: set language to use
 # (Default: empty)
-LIVE_LANGUAGE=""
+LH_LANGUAGE=""
 
-# $LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LIVE_LINUX_FLAVOURS="powerpc"
+LH_LINUX_FLAVOURS="powerpc"
 
-# $LIVE_LINUX_PACKAGES: set kernel packages to use
+# $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LIVE_PACKAGES: set packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
-LIVE_PACKAGES=""
+LH_PACKAGES=""
 
-# $LIVE_PACKAGES_LISTS: set package list to install
+# $LH_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LIVE_PACKAGES_LISTS="standard-x11"
+LH_PACKAGES_LISTS="standard-x11"
 
-# $LIVE_TASKS: set tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
-LIVE_TASKS="standard laptop xfce-desktop desktop"
+LH_TASKS="standard laptop xfce-desktop desktop"
 
-# $LIVE_SECURITY: enable security updates
+# $LH_SECURITY: enable security updates
 # (Default: enabled)
-LIVE_SECURITY="disabled"
+LH_SECURITY="disabled"
 
-# $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"
+LH_SYSVINIT="disabled"

Modified: configs/etch/powerpc-xfce-USB/config/common
===================================================================
--- configs/etch/powerpc-xfce-USB/config/common	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-USB/config/common	2007-08-04 13:25:35 UTC (rev 2672)
@@ -80,17 +80,17 @@
 # (Default: aptitude)
 LH_TASKSEL="aptitude"
 
-# $LIVE_ROOT: set root directory
+# $LH_ROOT: set root directory
 # (Default: debian-live)
-LIVE_ROOT="debian-live"
+LH_ROOT="debian-live"
 
-# $LIVE_INCLUDES: set includes
+# $LH_INCLUDES: set includes
 # (Default: /usr/share/live-helper/includes)
-LIVE_INCLUDES="/usr/share/live-helper/includes"
+LH_INCLUDES="/usr/share/live-helper/includes"
 
-# $LIVE_TEMPLATES: set templates
+# $LH_TEMPLATES: set templates
 # (Default: /usr/share/live-helper/templates)
-LIVE_TEMPLATES="/usr/share/live-helper/templates"
+LH_TEMPLATES="/usr/share/live-helper/templates"
 
 # Live-helper options
 

Modified: configs/etch/powerpc-xfce-USB/config/source
===================================================================
--- configs/etch/powerpc-xfce-USB/config/source	2007-08-04 13:24:10 UTC (rev 2671)
+++ configs/etch/powerpc-xfce-USB/config/source	2007-08-04 13:25:35 UTC (rev 2672)
@@ -1,9 +1,9 @@
 # config/source - options for live-helper(7), source stage
 
-# $LIVE_SOURCE: set source option
+# $LH_SOURCE: set source option
 # (Default: disabled)
-LIVE_SOURCE="disabled"
+LH_SOURCE="disabled"
 
-# $LIVE_SOURCE_IMAGES: set image type
+# $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
-LIVE_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"




More information about the debian-live-changes mailing list