[Debian-live-changes] r1044 - in dists/trunk/live-helper: doc
functions helpers manpages
Daniel Baumann
daniel at alioth.debian.org
Fri Apr 13 06:20:10 UTC 2007
Author: daniel
Date: 2007-04-13 06:20:10 +0000 (Fri, 13 Apr 2007)
New Revision: 1044
Added:
dists/trunk/live-helper/helpers/DIFF
dists/trunk/live-helper/helpers/lh__binary_memtest
dists/trunk/live-helper/helpers/lh_binary_memtest
Removed:
dists/trunk/live-helper/helpers/lh_binary_memtest86
Modified:
dists/trunk/live-helper/doc/ChangeLog
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_binary
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_usb
dists/trunk/live-helper/helpers/lh_config
dists/trunk/live-helper/helpers/make-live
dists/trunk/live-helper/manpages/lh_binary.1
dists/trunk/live-helper/manpages/live-helper.7
Log:
Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/doc/ChangeLog 2007-04-13 06:20:10 UTC (rev 1044)
@@ -2,6 +2,8 @@
* helpers/lh_config, make-live:
- Adding --config.
+ * helpers/lh_binary_memtester86:
+ - Renamed to lh_binary_memtest, made more generic.
* functions/defaults.sh:
- Settin default distributio to etch until 2.6.20 has setteled in
unstable.
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-04-13 06:20:10 UTC (rev 1044)
@@ -496,10 +496,10 @@
LIVE_FILESYSTEM="squashfs"
fi
- # Setting memtest86 option
- if [ -z "${LIVE_MEMTEST86}" ]
+ # Setting memtest option
+ if [ -z "${LIVE_MEMTEST}" ]
then
- LIVE_MEMTEST86="enabled"
+ LIVE_MEMTEST="memtest86+"
fi
# Setting iso volume
Added: dists/trunk/live-helper/helpers/DIFF
===================================================================
Copied: dists/trunk/live-helper/helpers/lh__binary_memtest (from rev 1039, dists/trunk/live-helper/helpers/lh_binary_memtest86)
Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/lh_binary 2007-04-13 06:20:10 UTC (rev 1044)
@@ -42,7 +42,7 @@
# Prepare images
lh_binary_linuximage "${@}"
-lh_binary_memtest86 "${@}"
+lh_binary_memtest "${@}"
lh_binary_grub "${@}"
lh_binary_syslinux "${@}"
lh_binary_yaboot "${@}"
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-13 06:20:10 UTC (rev 1044)
@@ -167,7 +167,7 @@
# Assembling memtest configuration
if [ -f "${DESTDIR}"/memtest ]
then
- MEMTEST="title\t\tMemtest86+\nkernel\t\t/`basename ${DESTDIR}`/memtest"
+ MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR}`/memtest"
MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi
Added: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-04-13 06:20:10 UTC (rev 1044)
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs a memtest into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
+Set_defaults
+
+if [ "${LIVE_MEMTEST}" = "disabled" ]
+then
+ exit 0
+fi
+
+Breakpoint "binary_memtest: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ echo "W: skipping binary_memtest, foreign architecture."
+ exit 0
+fi
+
+case "${LIVE_MEMTEST}" in
+ memtest86)
+ if [ ! -f chroot/boot/memtest86.bin ]
+ then
+ PACKAGES="${PACKAGES} memtest86"
+ fi
+ ;;
+
+ memtest86+)
+ if [ ! -f chroot/boot/memtest86+.bin ]
+ then
+ PACKAGES="${PACKAGES} memtest86+"
+ fi
+ ;;
+esac
+
+if [ -n "${PACKAGES}" ]
+then
+ # Installing symlinks
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes ${PACKAGES}"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes ${PACKAGES}"
+ ;;
+ esac
+fi
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGE}" in
+ iso)
+ DESTDIR="binary/live"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ ;;
+
+ usb|hdd)
+ DESTDIR="binary"
+ ;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+ # Assemble multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ ;;
+ esac
+ fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+ mkdir -p "${DESTDIR}"
+fi
+
+# Installing memtest
+case "${LIVE_MEMTEST}" in
+ memtest86)
+ cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
+ ;;
+
+ memtest86+)
+ cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
+ ;;
+esac
+
+if [ -n "${PACKAGES}" ]
+then
+ # Removing packages
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get remove --purge --yes ${PACKAGES}"
+ ;;
+
+ aptitude)
+ Chroot "aptitude purge --assume-yes ${PACKAGES}"
+ ;;
+ esac
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest
Property changes on: dists/trunk/live-helper/helpers/lh_binary_memtest
___________________________________________________________________
Name: svn:executable
+ *
Deleted: dists/trunk/live-helper/helpers/lh_binary_memtest86
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest86 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest86 2007-04-13 06:20:10 UTC (rev 1044)
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest86(1) - installs memtest86+ into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs memtest86+ into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "binary_memtest86: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest86
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- echo "W: skipping binary_memtest86, foreign architecture."
- exit 0
-fi
-
-if [ "${LIVE_MEMTEST86}" = "enabled" ]
-then
- if [ ! -f chroot/boot/memtest86+.bin ]
- then
- PACKAGES="${PACKAGES} memtest86+"
- fi
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Setting destination directory
- case "${LIVE_BINARY_IMAGE}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb|hdd)
- DESTDIR="binary"
- ;;
- esac
-
- # Temporary check for broken syslinux
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
- then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
- esac
- fi
- fi
-
- # Creating directory
- if [ ! -d "${DESTDIR}" ]
- then
- mkdir -p "${DESTDIR}"
- fi
-
- # Installing memtest86+
- cp chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
-
- if [ -n "${PACKAGES}" ]
- then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Creating stage file
- Create_stagefile .stage/binary_memtest86
-fi
Modified: dists/trunk/live-helper/helpers/lh_binary_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-13 06:20:10 UTC (rev 1044)
@@ -123,9 +123,15 @@
case "${LIVE_BOOTLOADER}" in
grub)
- echo "(hd0) ${FREELO}" > chroot/boot/grub/device.map
- Chroot "grub-install --recheck --no-floppy --root-directory=/boot/grub (hd0)"
- rm -f chroot/boot/grub/device.map
+ #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
+#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
+#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
+#
+#quit
+#EOF
+ #rm -f binary/boot/grub/device.map
+
+ #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
;;
syslinux)
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/lh_config 2007-04-13 06:20:10 UTC (rev 1044)
@@ -269,9 +269,9 @@
# (Default: ${LIVE_FILESYSTEM})
LIVE_FILESYSTEM="${LIVE_FILESYSTEM}"
-# \$LIVE_MEMTEST86: set memtest86+
-# (Default: ${LIVE_MEMTEST86})
-LIVE_MEMTEST86="${LIVE_MEMTEST86}"
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
# \$LIVE_ISO_VOLUME: set iso volume
# (Default: ${LIVE_ISO_VOLUME})
Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/helpers/make-live 2007-04-13 06:20:10 UTC (rev 1044)
@@ -31,13 +31,13 @@
# Set static variables
PROGRAM="`basename ${0}`"
DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution testing|unstable|etch|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest86 enabled|disabled] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose]"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution testing|unstable|etch|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose]"
HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
Local_arguments ()
{
- ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest86:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+ ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@@ -228,8 +228,8 @@
LIVE_FILESYSTEM="${2}"; shift 2
;;
- --memtest86)
- LIVE_MEMTEST86="${2}"; shift 2
+ --memtest)
+ LIVE_MEMTEST="${2}"; shift 2
;;
--iso-volume)
@@ -341,7 +341,7 @@
Local_arguments "${@}"
# Configuring (this is really shit!)
- LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST86="${LIVE_MEMTEST86}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config newconfig
+ LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config newconfig
if [ "${LH_BREAKPOINTS}" = "enabled" ]
then
Modified: dists/trunk/live-helper/manpages/lh_binary.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.1 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/manpages/lh_binary.1 2007-04-13 06:20:10 UTC (rev 1044)
@@ -31,8 +31,8 @@
creates the package list of the root filesystem.
.IP "\fIlh_binary_md5sum\fR(1)" 4
creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest86\fR(1)" 4
-copies memtest86 into the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
.IP "\fIlh_binary_net\fR(1)" 4
creates the netboot binary tarball.
.IP "\fIlh_binary_rootfs\fR(1)" 4
Modified: dists/trunk/live-helper/manpages/live-helper.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.7 2007-04-12 13:24:43 UTC (rev 1043)
+++ dists/trunk/live-helper/manpages/live-helper.7 2007-04-13 06:20:10 UTC (rev 1044)
@@ -47,8 +47,8 @@
creates the package list of the root filesystem.
.IP "\fIlh_binary_md5sum\fR(1)" 4
creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest86\fR(1)" 4
-copies memtest86 into the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
.IP "\fIlh_binary_net\fR(1)" 4
creates the netboot binary tarball.
.IP "\fIlh_binary_rootfs\fR(1)" 4
More information about the Debian-live-changes
mailing list