From 0d0de885e32ff67d57bb7def451b62d75b8920ab Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:17 +0200
Subject: Adding live-helper 1.0~a22-1.
---
debian/changelog | 10 +
debian/cron.daily | 12 +-
debian/default | 2 +-
docs/ChangeLog | 58 +
examples/cron/etch.sh | 14 +-
examples/cron/lenny.sh | 14 +-
examples/cron/sid.sh | 14 +-
examples/hooks/aufs.sh | 13 +
examples/hooks/squashfs.sh | 13 +
examples/hooks/unionfs.sh | 13 +
functions/architecture.sh | 8 +-
functions/arguments.sh | 46 +-
functions/cache.sh | 4 +-
functions/chroot.sh | 2 +-
functions/common.sh | 2 +-
functions/defaults.sh | 358 ++--
functions/packages.sh | 83 +-
functions/templates.sh | 12 +-
helpers/lh_binary | 4 +-
helpers/lh_binary_chroot | 7 +-
helpers/lh_binary_debian-installer | 70 +-
helpers/lh_binary_disk | 12 +-
helpers/lh_binary_encryption | 16 +-
helpers/lh_binary_grub | 64 +-
helpers/lh_binary_includes | 66 +-
helpers/lh_binary_iso | 28 +-
helpers/lh_binary_linux-image | 8 +-
helpers/lh_binary_local-includes | 2 +-
helpers/lh_binary_memtest | 18 +-
helpers/lh_binary_net | 12 +-
helpers/lh_binary_rootfs | 14 +-
helpers/lh_binary_syslinux | 171 +-
helpers/lh_binary_tar | 2 +-
helpers/lh_binary_usb-hdd | 18 +-
helpers/lh_binary_yaboot | 56 +-
helpers/lh_bootstrap_cdebootstrap | 20 +-
helpers/lh_bootstrap_debootstrap | 12 +-
helpers/lh_chroot_apt | 31 +-
helpers/lh_chroot_hacks | 12 +-
helpers/lh_chroot_hooks | 6 +-
helpers/lh_chroot_hostname | 42 +-
helpers/lh_chroot_interactive | 4 +-
helpers/lh_chroot_linux-image | 6 +-
helpers/lh_chroot_localization | 32 +-
helpers/lh_chroot_packages | 6 +-
helpers/lh_chroot_packageslists | 4 +-
helpers/lh_chroot_preseed | 2 +-
helpers/lh_chroot_sources | 54 +-
helpers/lh_chroot_symlinks | 2 +-
helpers/lh_chroot_sysvinit | 2 +-
helpers/lh_chroot_tasks | 6 +-
helpers/lh_config | 813 ++++++--
helpers/lh_losetup | 26 +-
helpers/lh_source_debian | 30 +-
helpers/lh_source_debian-live | 2 +-
helpers/lh_source_disk | 10 +-
helpers/lh_source_iso | 20 +-
helpers/lh_source_md5sum | 2 +-
helpers/lh_source_net | 4 +-
helpers/lh_source_tar | 4 +-
helpers/lh_source_usb-hdd | 4 +-
helpers/make-live | 388 +---
lists/devel-live | 11 +-
lists/knoppix | 1352 ++++++++++++
lists/knoppix-dvd | 3481 +++++++++++++++++++++++++++++++
lists/rescue | 33 +-
lists/studio | 103 +
lists/studio-gnome | 5 +
lists/studio-kde | 5 +
lists/studio-xfce | 5 +
manpages/lh_binary.de.1 | 4 +-
manpages/lh_binary.en.1 | 4 +-
manpages/lh_bootstrap.de.1 | 4 +-
manpages/lh_bootstrap.en.1 | 4 +-
manpages/lh_bootstrap_cdebootstrap.de.1 | 14 +-
manpages/lh_bootstrap_cdebootstrap.en.1 | 14 +-
manpages/lh_bootstrap_debootstrap.de.1 | 14 +-
manpages/lh_bootstrap_debootstrap.en.1 | 14 +-
manpages/lh_build.de.1 | 4 +-
manpages/lh_build.en.1 | 4 +-
manpages/lh_chroot.de.1 | 4 +-
manpages/lh_chroot.en.1 | 4 +-
manpages/lh_clean.de.1 | 4 +-
manpages/lh_clean.en.1 | 4 +-
manpages/lh_source.de.1 | 4 +-
manpages/lh_source.en.1 | 4 +-
manpages/lh_testroot.de.1 | 4 +-
manpages/lh_testroot.en.1 | 4 +-
manpages/live-helper.de.7 | 4 +-
manpages/live-helper.en.7 | 4 +-
templates/syslinux/f1.txt.install | 6 +-
templates/syslinux/f1.txt.live | 6 +-
templates/syslinux/f10.txt | 2 +-
templates/syslinux/f3.txt.install | 2 +-
templates/syslinux/f3.txt.install.g-i | 2 +-
templates/syslinux/f3.txt.live | 2 +-
templates/syslinux/syslinux.cfg | 2 +-
templates/yaboot/boot.msg | 2 +-
templates/yaboot/pegasos | 2 +-
99 files changed, 6584 insertions(+), 1347 deletions(-)
create mode 100755 examples/hooks/aufs.sh
create mode 100755 examples/hooks/squashfs.sh
create mode 100755 examples/hooks/unionfs.sh
create mode 100644 lists/knoppix
create mode 100644 lists/knoppix-dvd
create mode 100644 lists/studio
create mode 100644 lists/studio-gnome
create mode 100644 lists/studio-kde
create mode 100644 lists/studio-xfce
diff --git a/debian/changelog b/debian/changelog
index 4b0e256..a7328a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+live-helper (1.0~a22-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Replacing make-live with lh_config and lh_build (Closes: #435484).
+ - Added workaround from matth in lh_binary_grub, lh_binary_syslinux and
+ lh_binary_yaboot to work under dash (Closes: #431748).
+ - Using fake hostname instead of setting it at build-time (Closes: #435699).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 6 Aug 2007 00:00:00 +0200
+
live-helper (1.0~a21-1) unstable; urgency=medium
* New upstream release:
diff --git a/debian/cron.daily b/debian/cron.daily
index a8c139f..a5febe5 100644
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -5,7 +5,7 @@ set -e
BUILD="daily"
# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
then
exit 0
fi
@@ -48,11 +48,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
@@ -88,11 +89,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
diff --git a/debian/default b/debian/default
index 8aebe5a..0ca9a27 100644
--- a/debian/default
+++ b/debian/default
@@ -14,4 +14,4 @@ MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
MIRROR_BINARY="http://ftp.debian.org/debian/"
MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
diff --git a/docs/ChangeLog b/docs/ChangeLog
index fc54291..d1b862b 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,60 @@
+2007-08-12 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 1.0~a22-1.
+
+2007-08-08 Daniel Baumann <daniel@debian.org>
+
+ * functions/lh_chroot_hacks:
+ - Remove resume partition configuration in initramfs on etch.
+
+2007-08-07 Daniel Baumann <daniel@debian.org>
+
+ * functions/defaults.sh:
+ - Added auto mode for LH_INITRAMFS.
+
+2007-08-05 Daniel Baumann <daniel@debian.org>
+
+ * functions/defaults.sh:
+ - Added debian-edu mode.
+ * lists/knoppix, knoppix-dvd:
+ - Added.
+
+2007-08-05 Mathieu Geli <mathieu.geli@gmail.com>
+
+ * lists/studio, studio-gnome, studio-kde, studio-xfce:
+ - Added.
+
+2007-08-04 Daniel Baumann <daniel@debian.org>
+
+ * functions/*, helpers/*:
+ - Renaming LIVE_* variables to LH_*.
+ * excamples/cron/*:
+ - Updated to make-live removal.
+ * helpers/lh_binary_chroot:
+ - Exit earlier when rootfs was cached.
+ * helpers/lh_binary_debian-installer, lh_binary_includes:
+ - Fixed some bashisms.
+ * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
+ - Workaround from matth over /bin/echo to avoid wrong expansion
+ of entries when using dash (Closes: #431748).
+ * helpers/lh_chroot_hostname:
+ - Installing fake hostname, less intrusive approach for the build
+ system (Closes: #435699).
+ * helpers/lh_config:
+ - Added argument handling.
+ * helpers/lh_losetup:
+ - Simplified and corrected to make it actually work.
+ * helpers/lh_source:
+ - Not using 'echo -e' anymore.
+ * helpers/make-live:
+ - Replaced with a dummy: make-live is deprecated now, use lh_config
+ and lh_build instead.
+
+2007-08-03 Daniel Baumann <daniel@debian.org>
+
+ * helpers/lh_chroot_apt:
+ - Updated configuration of recommends handling for apt.
+
2007-07-29 Daniel Baumann <daniel@debian.org>
* functions/packages.sh:
@@ -5,6 +62,7 @@
and on systems where dpkg-query is available.
* functions/stagefile.sh:
- Added missing NAME.
+ * Uploaded 1.0~a21-1.
2007-07-28 Daniel Baumann <daniel@debian.org>
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index 49c62b7..3b9842c 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -19,11 +19,11 @@ MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
MIRROR_BINARY="http://ftp.debian.org/debian/"
MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
# End custom defaults
# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
then
exit 0
fi
@@ -66,11 +66,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config --binary-images iso --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
@@ -106,11 +107,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config --binary-images usb-hdd --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
diff --git a/examples/cron/lenny.sh b/examples/cron/lenny.sh
index 10cef51..cdec0d1 100755
--- a/examples/cron/lenny.sh
+++ b/examples/cron/lenny.sh
@@ -19,11 +19,11 @@ MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
MIRROR_BINARY="http://ftp.debian.org/debian/"
MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
# End custom defaults
# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
then
exit 0
fi
@@ -66,11 +66,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config --binary-images iso --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
@@ -106,11 +107,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config --binary-images usb-hdd --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
diff --git a/examples/cron/sid.sh b/examples/cron/sid.sh
index 7769fef..4068922 100755
--- a/examples/cron/sid.sh
+++ b/examples/cron/sid.sh
@@ -19,11 +19,11 @@ MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
MIRROR_BINARY="http://ftp.debian.org/debian/"
MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
# End custom defaults
# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
then
exit 0
fi
@@ -66,11 +66,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config --binary-images iso --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
@@ -106,11 +107,12 @@ do
# Creating build directory
mkdir -p "${TEMPDIR}"/debian-live
- cd "${TEMPDIR}"
+ cd "${TEMPDIR}"/debian-live
echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
# Generating images
- make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+ lh_config --binary-images usb-hdd --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+ lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
fi
diff --git a/examples/hooks/aufs.sh b/examples/hooks/aufs.sh
new file mode 100755
index 0000000..ca637af
--- /dev/null
+++ b/examples/hooks/aufs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to install aufs drivers
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# Note: You only want to use this hook if there is no prebuild aufs-modules-*
+# package available for your kernel flavour.
+
+# Building kernel module
+which module-assistant || apt-get install --yes module-assistant
+module-assistant update
+module-assistant --non-inter --quiet auto-install aufs
+module-assistant clean aufs
diff --git a/examples/hooks/squashfs.sh b/examples/hooks/squashfs.sh
new file mode 100755
index 0000000..5be16e6
--- /dev/null
+++ b/examples/hooks/squashfs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to install squashfs drivers
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# Note: You only want to use this hook if there is no prebuild
+# squashfs-modules-* package available for your kernel flavour.
+
+# Building kernel module
+which module-assistant || apt-get install --yes module-assistant
+module-assistant update
+module-assistant --non-inter --quiet auto-install squashfs
+module-assistant clean squashfs
diff --git a/examples/hooks/unionfs.sh b/examples/hooks/unionfs.sh
new file mode 100755
index 0000000..bbf210a
--- /dev/null
+++ b/examples/hooks/unionfs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to install unionfs drivers
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# Note: You only want to use this hook if there is no prebuild unionfs-modules-*
+# package available for your kernel flavour.
+
+# Building kernel module
+which module-assistant || apt-get install --yes module-assistant
+module-assistant update
+module-assistant --non-inter --quiet auto-install unionfs
+module-assistant clean unionfs
diff --git a/functions/architecture.sh b/functions/architecture.sh
index 29164d8..4c21458 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -16,7 +16,7 @@ Check_architecture ()
for ARCHITECTURE in ${ARCHITECTURES}
do
- if [ "`echo ${LIVE_ARCHITECTURE} | grep ${ARCHITECTURE}`" ]
+ if [ "`echo ${LH_ARCHITECTURE} | grep ${ARCHITECTURE}`" ]
then
VALID="true"
break
@@ -32,13 +32,13 @@ Check_architecture ()
Check_multiarchitecture ()
{
- if [ "`echo ${LIVE_ARCHITECTURE} | wc -w`" -gt "1" ]
+ if [ "`echo ${LH_ARCHITECTURE} | wc -w`" -gt "1" ]
then
# First, only support multiarch on iso
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ if [ "${LH_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
- case "${LIVE_CURRENT_ARCHITECTURE}" in
+ case "${LH_CURRENT_ARCHITECTURE}" in
amd64)
DESTDIR="${DESTDIR}.amd"
DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 0bb6441..3080f25 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -11,7 +11,7 @@ set -e
Arguments ()
{
- ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,logfile:,trace,root-command:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
+ ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@@ -25,55 +25,53 @@ Arguments ()
do
case "${1}" in
--breakpoints)
- LH_BREAKPOINTS="enabled"; shift
+ LH_BREAKPOINTS="enabled"
+ shift
;;
- --conffile)
- LH_CONFFILE="${2}"; shift 2
+ -c|-conffile)
+ LH_CONFFILE="${2}"
+ shift 2
;;
--debug)
- LH_DEBUG="enabled"; shift
+ LH_DEBUG="enabled"
+ shift
;;
--force)
- LH_FORCE="enabled"; shift
+ LH_FORCE="enabled"
+ shift
;;
-h|--help)
- Help; shift
- ;;
-
- --logfile)
- LH_LOGFILE="${2}"; shift 2
- ;;
-
- --trace)
- LH_TRACE="enabled"; shift
- ;;
-
- --root-command)
- LH_ROOT_COMMAND="${2}"; shift
+ Help
+ shift
;;
--quiet)
- LH_QUIET="enabled"; shift
+ LH_QUIET="enabled"
+ shift
;;
-u|--usage)
- Usage; shift
+ Usage
+ shift
;;
--verbose)
- LH_VERBOSE="enabled"; shift
+ LH_VERBOSE="enabled"
+ shift
;;
-v|--version)
- Version; shift
+ Version
+ shift
;;
--)
- shift; break
+ shift
+ break
;;
*)
diff --git a/functions/cache.sh b/functions/cache.sh
index d83b7e1..147cf5c 100755
--- a/functions/cache.sh
+++ b/functions/cache.sh
@@ -13,7 +13,7 @@ Restore_cache ()
{
DIRECTORY="${1}"
- if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+ if [ "${LH_CACHE}" = "enabled" ] && [ "${LH_CACHE_PACKAGES}" = "enabled" ]
then
if [ -d "${DIRECTORY}" ]
then
@@ -27,7 +27,7 @@ Save_cache ()
{
DIRECTORY="${1}"
- if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+ if [ "${LH_CACHE}" = "enabled" ] && [ "${LH_CACHE_PACKAGES}" = "enabled" ]
then
# Cleaning current cache
Chroot "apt-get autoclean"
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 12c49b6..ca48e00 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -15,7 +15,7 @@ Chroot ()
# Executing commands in chroot
Echo_debug "Executing: ${COMMANDS}"
- ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+ ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
return "${?}"
}
diff --git a/functions/common.sh b/functions/common.sh
index 19abcbb..2858239 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
-VERSION="1.0~a21"
+VERSION="1.0~a22"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ff2f408..29633de 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -39,15 +39,15 @@ Set_defaults ()
fi
# Setting distribution name
- if [ -z "${LIVE_DISTRIBUTION}" ]
+ if [ -z "${LH_DISTRIBUTION}" ]
then
case "${LH_MODE}" in
- debian)
- LIVE_DISTRIBUTION="etch"
+ debian|debian-edu)
+ LH_DISTRIBUTION="etch"
;;
ubuntu)
- LIVE_DISTRIBUTION="feisty"
+ LH_DISTRIBUTION="gutsy"
;;
esac
fi
@@ -56,24 +56,24 @@ Set_defaults ()
LH_APT="${LH_APT:-aptitude}"
# Setting apt ftp proxy
- if [ -z "${LH_APT_FTPPROXY}" ] && [ -n "${ftp_proxy}" ]
+ if [ -z "${LH_APT_FTP_PROXY}" ] && [ -n "${ftp_proxy}" ]
then
- LH_APT_FTPPROXY="${ftp_proxy}"
+ LH_APT_FTP_PROXY="${ftp_proxy}"
else
- if [ -n "${LH_APT_FTPPROXY}" ] && [ "${LH_APT_FTPRPOXY}" != "${ftp_proxy}" ]
+ if [ -n "${LH_APT_FTP_PROXY}" ] && [ "${LH_APT_FTP_PROXY}" != "${ftp_proxy}" ]
then
- ftp_proxy="${LH_APT_FTPRPOXY}"
+ ftp_proxy="${LH_APT_FTP_PROXY}"
fi
fi
# Setting apt http proxy
- if [ -z "${LH_APT_HTTPPROXY}" ] && [ -n "${http_proxy}" ]
+ if [ -z "${LH_APT_HTTP_PROXY}" ] && [ -n "${http_proxy}" ]
then
- LH_APT_HTTPPROXY="${http_proxy}"
+ LH_APT_HTTP_PROXY="${http_proxy}"
else
- if [ -n "${LH_APT_HTTPPROXY}" ] && [ "${LH_APT_HTTPRPOXY}" != "${http_proxy}" ]
+ if [ -n "${LH_APT_HTTP_PROXY}" ] && [ "${LH_APT_HTT_PROXY}" != "${http_proxy}" ]
then
- http_proxy="${LH_APT_HTTPPROXY}"
+ http_proxy="${LH_APT_HTTP_PROXY}"
fi
fi
@@ -84,7 +84,15 @@ Set_defaults ()
# LH_APT_PIPELINE
# Setting apt recommends
- LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
+ case "${LH_MODE}" in
+ debian-edu)
+ LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-disabled}"
+ ;;
+
+ *)
+ LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
+ ;;
+ esac
# Setting apt secure
LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
@@ -93,7 +101,7 @@ Set_defaults ()
if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "`which ${LH_BOOTSTRAP}`" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
if [ -x "/usr/bin/cdebootstrap" ]
then
LH_BOOTSTRAP="cdebootstrap"
@@ -110,7 +118,7 @@ Set_defaults ()
if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
then
LH_BOOTSTRAP="cdebootstrap"
- elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
+ elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ]
then
LH_BOOTSTRAP="debootstrap"
else
@@ -122,6 +130,7 @@ Set_defaults ()
fi
# Setting cache option
+ LH_CACHE="${LH_CACHE:-enabled}"
LH_CACHE_INDICES="${LH_CACHE_INDICES:-disabled}"
LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-enabled}"
LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}"
@@ -145,7 +154,7 @@ Set_defaults ()
if [ -z "${LH_GENISOIMAGE}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_GENISOIMAGE="genisoimage"
;;
@@ -158,11 +167,28 @@ Set_defaults ()
# Setting initramfs hook
if [ -z "${LH_INITRAMFS}" ]
then
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ LH_INITRAMFS="auto"
+ else
+ if [ "${LH_INITRAMFS}" = "auto" ]
then
- LH_INITRAMFS="casper"
- else
- LH_INITRAMFS="live-initramfs"
+ case "${LH_MODE}" in
+ debian)
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
+ then
+ LH_INITRAMFS="casper"
+ else
+ LH_INITRAMFS="live-initramfs"
+ fi
+ ;;
+
+ debian-edu)
+ LH_INITRAMFS="live-initramfs"
+ ;;
+
+ ubuntu)
+ LH_INITRAMFS="live-initramfs"
+ ;;
+ esac
fi
fi
@@ -184,13 +210,13 @@ Set_defaults ()
if [ "`id -u`" = "0" ]
then
# If we are root, disable root command
- LIVE_ROOT_COMMAND=""
+ LH_ROOT_COMMAND=""
else
if [ -x /usr/bin/sudo ]
then
# FIXME: this is disabled until considered safe
- #LIVE_ROOT_COMMAND="sudo"
- LIVE_ROOT_COMMAND=""
+ #LH_ROOT_COMMAND="sudo"
+ LH_ROOT_COMMAND=""
fi
fi
@@ -198,29 +224,33 @@ Set_defaults ()
LH_TASKSEL="${LH_TASKSEL:-aptitude}"
# Setting root directory
- if [ -z "${LIVE_ROOT}" ]
+ if [ -z "${LH_ROOT}" ]
then
case "${LH_MODE}" in
debian)
- LIVE_ROOT="debian-live"
+ LH_ROOT="debian-live"
+ ;;
+
+ debian-edu)
+ LH_ROOT="edu-live"
;;
ubuntu)
- LIVE_ROOT="ubuntu-live"
+ LH_ROOT="ubuntu-live"
;;
esac
fi
# Setting includes
- if [ -z "${LIVE_INCLUDES}" ]
+ if [ -z "${LH_INCLUDES}" ]
then
- LIVE_INCLUDES="${LH_BASE:-/usr/share/live-helper}/includes"
+ LH_INCLUDES="${LH_BASE:-/usr/share/live-helper}/includes"
fi
# Setting templates
- if [ -z "${LIVE_TEMPLATES}" ]
+ if [ -z "${LH_TEMPLATES}" ]
then
- LIVE_TEMPLATES="${LH_BASE:-/usr/share/live-helper}/templates"
+ LH_TEMPLATES="${LH_BASE:-/usr/share/live-helper}/templates"
fi
# Setting live helper options
@@ -233,50 +263,54 @@ Set_defaults ()
## config/bootstrap
# Setting architecture value
- if [ -z "${LIVE_ARCHITECTURE}" ]
+ if [ -z "${LH_ARCHITECTURE}" ]
then
if [ -x "/usr/bin/dpkg" ]
then
- LIVE_ARCHITECTURE="`dpkg --print-architecture`"
+ LH_ARCHITECTURE="`dpkg --print-architecture`"
else
echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
- LIVE_ARCHITECTURE="i386"
+ LH_ARCHITECTURE="i386"
fi
fi
# Setting distribution configuration value
- # LIVE_BOOTSTRAP_CONFIG
+ # LH_BOOTSTRAP_CONFIG
# Setting flavour value
- LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR:-standard}"
+ LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR:-standard}"
# Setting boostrap keyring
- # LIVE_BOOTSTRAP_KEYRING
+ # LH_BOOTSTRAP_KEYRING
# Setting mirror to fetch packages from
- if [ -z "${LIVE_MIRROR_BOOTSTRAP}" ]
+ if [ -z "${LH_MIRROR_BOOTSTRAP}" ]
then
case "${LH_MODE}" in
debian)
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386)
- LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+ LH_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
;;
*)
- LIVE_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+ LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
;;
esac
;;
+ debian-edu)
+ LH_MIRROR_BOOTSTRAP="http://ftp.skolelinux.no/debian/"
+ ;;
+
ubuntu)
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
+ LH_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
;;
hppa|ia64)
- LIVE_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
+ LH_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
;;
*)
@@ -289,25 +323,25 @@ Set_defaults ()
fi
# Setting security mirror to fetch packages from
- if [ -z "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" ]
+ if [ -z "${LH_MIRROR_BOOTSTRAP_SECURITY}" ]
then
case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
+ debian|debian-edu)
+ LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
;;
ubuntu)
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://archive.ubuntu.com/ubuntu/"
+ LH_MIRROR_BOOTSTRAP_SECURITY="http://archive.ubuntu.com/ubuntu/"
;;
hppa|ia64)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://ports.ubuntu.com/"
+ LH_MIRROR_BOOTSTRAP_SECURITY="http://ports.ubuntu.com/"
;;
*)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="none"
+ LH_MIRROR_BOOTSTRAP_SECURITY="none"
;;
esac
;;
@@ -315,29 +349,33 @@ Set_defaults ()
fi
# Setting mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_BINARY}" ]
+ if [ -z "${LH_MIRROR_BINARY}" ]
then
case "${LH_MODE}" in
debian)
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386)
- LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
+ LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
;;
*)
- LIVE_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
+ LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
;;
esac
;;
+ debian-edu)
+ LH_MIRROR_BINARY="http://ftp.skolelinux.no/debian/"
+ ;;
+
ubuntu)
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
+ LH_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
;;
hppa|ia64)
- LIVE_MIRROR_BINARY="http://ports.ubuntu.com/"
+ LH_MIRROR_BINARY="http://ports.ubuntu.com/"
;;
*)
@@ -350,21 +388,21 @@ Set_defaults ()
fi
# Setting security mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_BINARY_SECURITY}" ]
+ if [ -z "${LH_MIRROR_BINARY_SECURITY}" ]
then
case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+ debian|debian-edu)
+ LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
;;
ubuntu)
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
+ LH_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
;;
*)
- LIVE_MIRROR_BINARY_SECURITY="none"
+ LH_MIRROR_BINARY_SECURITY="none"
;;
esac
;;
@@ -372,15 +410,15 @@ Set_defaults ()
fi
# Setting sections value
- if [ -z "${LIVE_SECTIONS}" ]
+ if [ -z "${LH_SECTIONS}" ]
then
case "${LH_MODE}" in
- debian)
- LIVE_SECTIONS="main"
+ debian|debian-edu)
+ LH_SECTIONS="main"
;;
ubuntu)
- LIVE_SECTIONS="main restricted"
+ LH_SECTIONS="main restricted"
;;
esac
fi
@@ -388,38 +426,42 @@ Set_defaults ()
## config/chroot
# Setting chroot filesystem
- LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}"
+ LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM:-squashfs}"
# Setting union filesystem
- LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM:-unionfs}"
+ LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM:-unionfs}"
- # LIVE_HOOKS
+ # LH_HOOKS
# Setting interactive shell/X11/Xnest
- LIVE_INTERACTIVE="${LIVE_INTERACTIVE:-disabled}"
+ LH_INTERACTIVE="${LH_INTERACTIVE:-disabled}"
# Setting keyring packages
- # LIVE_KEYRING_PACKAGES
+ case "${LH_MODE}" in
+ debian-edu)
+ LH_KEYRING_PACKAGES="debian-edu-archive-keyring"
+ ;;
+ esac
# Setting language string
- # LIVE_LANGUAGE
+ # LH_LANGUAGE
# Setting linux flavour string
- if [ -z "${LIVE_LINUX_FLAVOURS}" ]
+ if [ -z "${LH_LINUX_FLAVOURS}" ]
then
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
alpha)
- LIVE_LINUX_FLAVOURS="alpha-generic"
+ LH_LINUX_FLAVOURS="alpha-generic"
;;
amd64)
case "${LH_MODE}" in
- debian)
- LIVE_LINUX_FLAVOURS="amd64"
+ debian|debian-edu)
+ LH_LINUX_FLAVOURS="amd64"
;;
ubuntu)
- LIVE_LINUX_FLAVOURS="amd64-generic"
+ LH_LINUX_FLAVOURS="amd64-generic"
;;
esac
;;
@@ -430,47 +472,51 @@ Set_defaults ()
;;
hppa)
- LIVE_LINUX_FLAVOURS="parisc"
+ LH_LINUX_FLAVOURS="parisc"
;;
i386)
case "${LH_MODE}" in
- debian)
- LIVE_LINUX_FLAVOURS="486"
+ debian|debian-edu)
+ LH_LINUX_FLAVOURS="486"
;;
ubuntu)
- LIVE_LINUX_FLAVOURS="386"
+ LH_LINUX_FLAVOURS="386"
;;
esac
;;
ia64)
- LIVE_LINUX_FLAVOURS="itanium"
+ LH_LINUX_FLAVOURS="itanium"
;;
m68k)
- LIVE_LINUX_FLAVOURS="You need to specify the linux kernel flavour manually on m68k."
+ LH_LINUX_FLAVOURS="You need to specify the linux kernel flavour manually on m68k."
exit 1
;;
powerpc)
- LIVE_LINUX_FLAVOURS="powerpc"
+ LH_LINUX_FLAVOURS="powerpc"
;;
s390)
- LIVE_LINUX_FLAVOURS="s390"
+ LH_LINUX_FLAVOURS="s390"
;;
sparc)
case "${LH_MODE}" in
- debian)
- LIVE_LINUX_FLAVOURS="sparc32"
- # FIXME: needs update after etch
+ debian|debian-edu)
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
+ then
+ LH_LINUX_FLAVOURS="sparc32"
+ else
+ LH_LINUX_FLAVOURS="sparc64"
+ fi
;;
ubuntu)
- LIVE_LINUX_FLAVOURS="sparc64"
+ LH_LINUX_FLAVOURS="sparc64"
;;
esac
;;
@@ -482,37 +528,37 @@ Set_defaults ()
fi
# Set linux packages
- if [ -z "${LIVE_LINUX_PACKAGES}" ]
+ if [ -z "${LH_LINUX_PACKAGES}" ]
then
case "${LH_MODE}" in
- debian)
- LIVE_LINUX_PACKAGES="linux-image-2.6 ${LIVE_UNION_FILESYSTEM}-modules-2.6"
+ debian|debian-edu)
+ LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6"
- if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ]
+ if [ "${LH_CHROOT_FILESYSTEM}" = "squashfs" ]
then
- LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} squashfs-modules-2.6"
+ LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} squashfs-modules-2.6"
fi
;;
ubuntu)
- LIVE_LINUX_PACKAGES="linux-image"
+ LH_LINUX_PACKAGES="linux-image"
;;
esac
- if [ -n "${LIVE_ENCRYPTION}" ]
+ if [ -n "${LH_ENCRYPTION}" ]
then
- LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
+ LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6"
fi
fi
# Setting packages string
- # LIVE_PACKAGES
+ # LH_PACKAGES
# Setting packages list string
- LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
+ LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS:-standard}"
# Setting tasks string
- for LIST in ${LIVE_PACKAGES_LISTS}
+ for LIST in ${LH_PACKAGES_LISTS}
do
case "${LIST}" in
mini|minimal)
@@ -520,161 +566,175 @@ Set_defaults ()
;;
gnome-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
+ LH_PACKAGES_LISTS="`echo ${LH_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
+ LH_TASKS="`echo ${LH_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
;;
kde-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
+ LH_PACKAGES_LISTS="`echo ${LH_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
+ LH_TASKS="`echo ${LH_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
;;
xfce-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
+ LH_PACKAGES_LISTS="`echo ${LH_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
+ LH_TASKS="`echo ${LH_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
;;
esac
done
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
+ LH_PACKAGES_LISTS="`echo ${LH_PACKAGES_LISTS} | sed -e 's/ //g'`"
+ LH_TASKS="`echo ${LH_TASKS} | sed -e 's/ //g'`"
# Setting tasks
- # LIVE_TASKS
+ # LH_TASKS
# Setting security updates option
- if [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "none" ] || [ "${LIVE_MIRROR_BINARY_SECURITY}" = "none" ]
+ if [ "${LH_MIRROR_BOOTSTRAP_SECURITY}" = "none" ] || [ "${LH_MIRROR_BINARY_SECURITY}" = "none" ]
then
- LIVE_SECURITY="disabled"
+ LH_SECURITY="disabled"
fi
- LIVE_SECURITY="${LIVE_SECURITY:-enabled}"
+ LH_SECURITY="${LH_SECURITY:-enabled}"
# Setting symlink convertion option
- LIVE_SYMLINKS="${LIVE_SYMLINKS:-disabled}"
+ LH_SYMLINKS="${LH_SYMLINKS:-disabled}"
# Setting sysvinit option
- LIVE_SYSVINIT="${LIVE_SYSVINIT:-disabled}"
+ LH_SYSVINIT="${LH_SYSVINIT:-disabled}"
## config/binary
# Setting image type
- LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES:-iso}"
+ LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
# Setting apt indices
- LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES:-enabled}"
+ LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}"
# Setting boot parameters
- # LIVE_BOOTAPPEND
+ # LH_BOOTAPPEND
# Setting bootloader
- if [ -z "${LIVE_BOOTLOADER}" ]
+ if [ -z "${LH_BOOTLOADER}" ]
then
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64|i386)
- LIVE_BOOTLOADER="syslinux"
+ LH_BOOTLOADER="syslinux"
;;
powerpc)
- LIVE_BOOTLOADER="yaboot"
+ LH_BOOTLOADER="yaboot"
;;
esac
fi
# Setting chroot option
- LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD:-enabled}"
+ LH_CHROOT_BUILD="${LH_CHROOT_BUILD:-enabled}"
# Setting debian-installer option
- LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
+ LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-disabled}"
# Setting encryption
- # LIVE_ENCRYPTION
+ # LH_ENCRYPTION
# Setting grub splash
- # LIVE_GRUB_SPLASH
+ # LH_GRUB_SPLASH
# Setting hostname
- if [ -z "${LIVE_HOSTNAME}" ]
+ if [ -z "${LH_HOSTNAME}" ]
then
case "${LH_MODE}" in
- debian)
- LIVE_HOSTNAME="debian"
+ debian|debian-edu)
+ LH_HOSTNAME="debian"
;;
ubuntu)
- LIVE_HOSTNAME="ubuntu"
+ LH_HOSTNAME="ubuntu"
;;
esac
fi
# Setting iso author
- if [ -z "${LIVE_ISO_APPLICATION}" ]
+ if [ -z "${LH_ISO_APPLICATION}" ]
then
case "${LH_MODE}" in
debian)
- LIVE_ISO_APPLICATION="Debian Live"
+ LH_ISO_APPLICATION="Debian Live"
+ ;;
+
+ debian-edu)
+ LH_ISO_APPLICATION="Debian Edu Live"
;;
ubuntu)
- LIVE_ISO_APPLICATION="Ubuntu Live"
+ LH_ISO_APPLICATION="Ubuntu Live"
;;
esac
fi
# Set iso preparer
- LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER:-live-helper ${VERSION}; http://packages.qa.debian.org/live-helper}"
+ LH_ISO_PREPARER="${LH_ISO_PREPARER:-live-helper ${VERSION}; http://packages.qa.debian.org/live-helper}"
# Set iso publisher
- LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org}"
+ LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org}"
# Setting iso volume
- if [ -z "${LIVE_ISO_VOLUME}" ]
+ if [ -z "${LH_ISO_VOLUME}" ]
then
case "${LH_MODE}" in
debian)
- LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
+ LH_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
+ ;;
+
+ debian-edu)
+ LH_ISO_VOLUME="Debian Edu Live \`date +%Y%m%d-%H:%M\`"
;;
ubuntu)
- LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
+ LH_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
;;
esac
fi
# Setting memtest option
- LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}"
+ LH_MEMTEST="${LH_MEMTEST:-memtest86+}"
# Setting netboot filesystem
- LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM:-nfs}"
+ LH_NET_FILESYSTEM="${LH_NET_FILESYSTEM:-nfs}"
# Setting netboot server path
- if [ -z "${LIVE_NET_PATH}" ]
+ if [ -z "${LH_NET_PATH}" ]
then
case "${LH_MODE}" in
debian)
- LIVE_NET_PATH="/srv/debian-live"
+ LH_NET_PATH="/srv/debian-live"
+ ;;
+
+ debian-edu)
+ LH_NET_PATH="/srv/debian-edu-live"
;;
ubuntu)
- LIVE_NET_PATH="/srv/ubuntu-live"
+ LH_NET_PATH="/srv/ubuntu-live"
;;
esac
fi
# Setting netboot server address
- LIVE_NET_SERVER="${LIVE_NET_SERVER:-192.168.1.1}"
+ LH_NET_SERVER="${LH_NET_SERVER:-192.168.1.1}"
# Setting syslinux splash
- # LIVE_SYSLINUX_SPLASH
+ # LH_SYSLINUX_SPLASH
+
+ LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}"
# Setting username
- LIVE_USERNAME="${LIVE_USERNAME:-user}"
+ LH_USERNAME="${LH_USERNAME:-user}"
## config/source
# Setting source option
- LIVE_SOURCE="${LIVE_SOURCE:-disabled}"
+ LH_SOURCE="${LH_SOURCE:-disabled}"
# Setting image type
- LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-tar}"
+ LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES:-tar}"
}
diff --git a/functions/packages.sh b/functions/packages.sh
index 049c89b..9e10b1d 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -14,43 +14,23 @@ Check_package ()
FILE="${1}"
PACKAGE="${2}"
- case "${LIVE_CHROOT_BUILD}" in
- enabled)
- for ITEM in ${PACKAGE}
- do
- if ! `Chroot "dpkg-query -s ${ITEM}"`
- then
- PACKAGES="${PACKAGES} ${ITEM}"
- fi
- done
- ;;
+ Check_installed "${FILE}" "${PACKAGE}"
- disabled)
- if `which dpkg-query`
- then
- for ITEM in ${PACKAGE}
- do
- if ! `dpkg-query -s ${ITEM}`
- then
- PACKAGES="${PACKAGES} ${ITEM}"
- fi
- done
- else
- FILE="`echo ${FILE} | sed -e 's/chroot//'`"
+ case "${INSTALL_STATUS}" in
+ 1)
+ PACKAGES="${PACKAGES} ${PACKAGE}"
+ ;;
- if [ ! -f "${FILE}" ] && [ ! -d "${FILE}" ]
- then
- Echo_error "You need to install ${PACKAGE} on your host system."
- exit 1
- fi
- fi
+ 2)
+ Echo_error "You need to install ${PACKAGE} on your host system."
+ exit 1
;;
esac
}
Install_package ()
{
- if [ -n "${PACKAGES}" ] && [ "${LIVE_CHROOT_BUILD}" != "disabled" ]
+ if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
then
case "${LH_APT}" in
apt|apt-get)
@@ -66,7 +46,7 @@ Install_package ()
Remove_package ()
{
- if [ -n "${PACKAGES}" ] && [ "${LIVE_CHROOT_BUILD}" != "disabled" ]
+ if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
then
case "${LH_APT}" in
apt|apt-get)
@@ -79,3 +59,46 @@ Remove_package ()
esac
fi
}
+
+# Check_installed
+# uses as return value global var INSTALL_STATUS
+# INSTALL_STATUS : 0 if package is installed
+# 1 if package isn't installed and we're in an apt managed system
+# 2 if package isn't installed and we aren't in an apt managed system
+Check_installed ()
+{
+ FILE="${1}"
+ PACKAGE="${2}"
+
+ case "${LH_CHROOT_BUILD}" in
+ enabled)
+ if Chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
+ then
+ INSTALL_STATUS=0
+ else
+ INSTALL_STATUS=1
+ fi
+ ;;
+ disabled)
+ if which dpkg-query > /dev/null 2>&1
+ then
+ if Chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
+ then
+ INSTALL_STATUS=0
+ else
+ INSTALL_STATUS=1
+ fi
+ else
+ FILE="`echo ${FILE} | sed -e 's/chroot//'`"
+
+ if [ ! -e "${FILE}" ]
+ then
+ INSTALL_STATUS=2
+ else
+ INSTALL_STATUS=0
+ fi
+ fi
+ ;;
+ esac
+}
+
diff --git a/functions/templates.sh b/functions/templates.sh
index 54f81c1..59f2aef 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -14,22 +14,22 @@ Check_templates ()
PACKAGE="${1}"
# Check user defined templates directory
- if [ ! -e "${LIVE_TEMPLATES}" ]
+ if [ ! -e "${LH_TEMPLATES}" ]
then
if [ -d config/templates ]
then
- LIVE_TEMPLATES=config/templates
+ LH_TEMPLATES=config/templates
else
- Echo_error "templates not accessible in ${LIVE_TEMPLATES} nor config/templates"
+ Echo_error "templates not accessible in ${LH_TEMPLATES} nor config/templates"
exit 1
fi
fi
- if [ -d "${LIVE_TEMPLATES}/${PACKAGE}" ]
+ if [ -d "${LH_TEMPLATES}/${PACKAGE}" ]
then
- TEMPLATES="${LIVE_TEMPLATES}/${PACKAGE}"
+ TEMPLATES="${LH_TEMPLATES}/${PACKAGE}"
else
- Echo_error "${PACKAGE} templates not accessible in ${LIVE_TEMPLATES}"
+ Echo_error "${PACKAGE} templates not accessible in ${LH_TEMPLATES}"
exit 1
fi
}
diff --git a/helpers/lh_binary b/helpers/lh_binary
index c178309..4a1577d 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -35,7 +35,7 @@ Set_defaults
# Preparing root filesystem
lh_binary_chroot ${*}
-if [ "${LIVE_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "enabled" ]
then
# Configuring chroot
lh_chroot_proc install ${*}
@@ -70,7 +70,7 @@ lh_binary_net ${*}
lh_binary_tar ${*}
lh_binary_usb-hdd ${*}
-if [ "${LIVE_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "enabled" ]
then
# Deconfiguring chroot
rm -f .stage/chroot_sources
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 8bf6125..150d6b1 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -57,7 +57,12 @@ then
${LH_ROOT_COMMAND} umount chroot/sys
fi
-if [ "${LIVE_CHROOT_BUILD}" = "disabled" ]
+if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+then
+ exit 0
+fi
+
+if [ "${LH_CACHE}" = "enabled" ] && ls cache/stages_rootfs/filesystem* > /dev/null 2>&1
then
exit 0
fi
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index e4466df..6ae67cd 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -33,7 +33,7 @@ Read_conffile config/source
Set_defaults
# Setting remote d-i directories
-case "${LIVE_DEBIAN_INSTALLER}" in
+case "${LH_DEBIAN_INSTALLER}" in
enabled|cdrom|live)
DI="cdrom"
DI_GTK="${DI}/gtk"
@@ -51,7 +51,7 @@ case "${LIVE_DEBIAN_INSTALLER}" in
;;
*)
- Echo_error "debian-installer flavor ${LIVE_DEBIAN_INSTALLER} not supported."
+ Echo_error "debian-installer flavor ${LH_DEBIAN_INSTALLER} not supported."
exit 1
;;
esac
@@ -71,7 +71,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso)
DESTDIR="binary/install"
;;
@@ -88,7 +88,7 @@ case "${LIVE_BINARY_IMAGES}" in
DESTDIR="binary/install"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ if [ "${LH_DISTRIBUTION}" = "etch" ] && [ "${LH_BOOTLOADER}" = "syslinux" ]
then
DESTDIR="binary"
fi
@@ -106,9 +106,9 @@ INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+if [ "${LH_DISTRIBUTION}" = "etch" ]
then
- if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ if [ "${LH_BINARY_IMAGES}" = "tar" ] || [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
VMLINUZ_DI="vmlinuz.di"
INITRD_DI="initrddi.gz"
@@ -121,7 +121,7 @@ then
fi
# Debian Installer daily builds
-case "${LIVE_ARCHITECTURE}" in
+case "${LH_ARCHITECTURE}" in
alpha)
URL="http://people.debian.org/~vorlon/d-i/alpha/daily/"
;;
@@ -179,37 +179,37 @@ esac
# Downloading debian-installer
mkdir -p "${DESTDIR_DI}"
-if [ "${LIVE_DISTRIBUTION}" = "sid" ]
+if [ "${LH_DISTRIBUTION}" = "sid" ]
then
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
else
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
fi
# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
then
mkdir -p "${DESTDIR_GI}"
- if [ "${LIVE_DISTRIBUTION}" = "sid" ]
+ if [ "${LH_DISTRIBUTION}" = "sid" ]
then
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
else
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz
fi
fi
-if [ "${LIVE_DEBIAN_INSTALLER}" != "netboot" ]; then
+if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
# Downloading additional packages
mkdir -p chroot/binary.deb/archives/partial
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
- case "${LIVE_ARCHITECTURE}" in
+ case "${LH_ARCHITECTURE}" in
amd64)
DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
;;
@@ -261,7 +261,7 @@ then
fi
# Including local debs
-if ls ../config/binary_local-debs/* &> /dev/null
+if ls ../config/binary_local-debs/* > /dev/null 2>&1
then
for FILE in ../config/binary_local-debs/*.deb
do
@@ -291,21 +291,21 @@ then
fi
# Generating deb indices
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+mkdir -p binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}
cd binary
-apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
-gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
+apt-ftparchive packages pool/main > dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages
+gzip -9 -c dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages.gz
cd "${OLDPWD}"
# Fetching release
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
+wget "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release -O binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release
mkdir binary.udeb
cd binary.udeb
# Downloading udeb indices
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+wget "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.gz > Packages
# Sorting udebs
@@ -320,7 +320,7 @@ do
cp ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
else
# Downloading udebs
- wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+ wget "${LH_MIRROR_BOOTSTRAP}"/${UDEB}
fi
done
@@ -330,7 +330,7 @@ mkdir -p ../cache/packages_debian-installer.udeb
cp *.udeb ../cache/packages_debian-installer.udeb
# Including local udebs
-if ls ../config/binary_local-udebs/* &> /dev/null
+if ls ../config/binary_local-udebs/* > /dev/null 2>&1
then
for FILE in ../config/binary_local-udebs/*.udeb
do
@@ -363,9 +363,9 @@ then
fi
# Excluding udebs
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs >> exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude
for EXCLUDE in `cat exclude`
do
@@ -383,9 +383,9 @@ do
done
# Creating udeb indices
-mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
-gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
+mkdir -p dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"
+apt-ftparchive packages pool/main > dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages
+gzip -9 -c dists/${LH_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages.gz
rm -f Packages* exclude
find . | cpio -dmpu "${OLDPWD}"/binary
@@ -398,19 +398,19 @@ rm -rf binary.deb
apt-ftparchive \
-o APT::FTPArchive::Release::Origin="Debian" \
-o APT::FTPArchive::Release::Label="Debian" \
- -o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Suite="${LH_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Version="4.0" \
- -o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Codename="${LH_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="`date -R`" \
- -o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
+ -o APT::FTPArchive::Release::Architectures="${LH_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="main" \
-o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
-release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+release binary/dists/${LH_DISTRIBUTION} > binary/dists/${LH_DISTRIBUTION}/Release
# Creating dist symlinks
for DISTRIBUTION in frozen stable testing unstable
do
- ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+ ln -s ${LH_DISTRIBUTION} binary/dists/${DISTRIBUTION}
done
ln -s . binary/debian
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 3bc1230..5543949 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_BINARY_IMAGES}" != "iso" ]
+if [ "${LH_BINARY_IMAGES}" != "iso" ]
then
exit 0
fi
@@ -53,10 +53,10 @@ Create_lockfile .lock
mkdir -p binary/.disk
-ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
-DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
-DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
-eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+ARCHITECTURE="`echo ${LH_ARCHITECTURE} | sed -e 's# #/#g'`"
+DISTRIBUTION="`echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+DISTRIBUTION="${DISTRIBUTION}`echo ${LH_DISTRIBUTION} | cut -b 2-`"
+eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
case "${LH_MODE}" in
debian)
@@ -81,7 +81,7 @@ case "${LH_MODE}" in
;;
esac
-if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
echo "main" > binary/.disk/base_components
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 06ad2c4..0fb9b7e 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ -z "${LIVE_ENCRYPTION}" ]
+if [ -z "${LH_ENCRYPTION}" ]
then
exit 0
fi
@@ -62,7 +62,7 @@ case "${LH_INITRAMFS}" in
;;
esac
-case "${LIVE_CHROOT_FILESYSTEM}" in
+case "${LH_CHROOT_FILESYSTEM}" in
ext2)
ROOTFS="ext2"
;;
@@ -86,17 +86,17 @@ Restore_cache cache/packages_binary
# Installing depends
Install_package
-case "${LIVE_CHROOT_BUILD}" in
+case "${LH_CHROOT_BUILD}" in
enabled)
# Moving image
- mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot
+ mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot
-echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
+echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LH_ENCRYPTION}..."
cat >> chroot/encrypt.sh << EOF
while true
do
- cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
+ cat filesystem.${ROOTFS} | aespipe -e ${LH_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
echo -n "Something went wrong... Retry? [YES/no] "
@@ -113,14 +113,14 @@ EOF
Chroot "sh encrypt.sh"
# Move image
- mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
+ mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
rm -f chroot/encrypt.sh
;;
disabled)
while true
do
- cat binary/${INITFS}/filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > binary/${INITFS}/filesystem.${ROOTFS}.tmp && mv binary/${INITFS}/filesystem.${ROOTFS}.tmp binary/${INITFS}/filesystem.${ROOTFS} && break
+ cat binary/${INITFS}/filesystem.${ROOTFS} | aespipe -e ${LH_ENCRYPTION} -T > binary/${INITFS}/filesystem.${ROOTFS}.tmp && mv binary/${INITFS}/filesystem.${ROOTFS}.tmp binary/${INITFS}/filesystem.${ROOTFS} && break
echo -n "Something went wrong... Retry? [YES/no] "
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 1bcf4ab..ccb7153 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_BOOTLOADER}" != "grub" ]
+if [ "${LH_BOOTLOADER}" != "grub" ]
then
exit 0
fi
@@ -75,7 +75,7 @@ Grub_live_entry ()
APPEND="${4}"
LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
- LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}"
+ LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LH_BOOTAPPEND ${APPEND}"
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
}
@@ -86,7 +86,7 @@ Grub_install_entry ()
INITRD="${3}"
APPEND="${4}"
- if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ if [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
then
APPEND="${APPEND} quiet"
fi
@@ -107,7 +107,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso|tar)
case "${LH_INITRAMFS}" in
casper)
@@ -134,49 +134,49 @@ Check_multiarchitecture
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
+if [ -n "${LH_ENCRYPTION}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} encryption=${LH_ENCRYPTION}"
fi
-if [ -n "${LIVE_USERNAME}" ]
+if [ -n "${LH_USERNAME}" ]
then
case "${LH_INITRAMFS}" in
casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}"
;;
live-initramfs)
- if [ "${LIVE_USERNAME}" != "user" ]
+ if [ "${LH_USERNAME}" != "user" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LIVE_HOSTNAME}" ]
+if [ -n "${LH_HOSTNAME}" ]
then
case "${LH_INITRAMFS}" in
casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}"
;;
live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
+ if [ "${LH_HOSTNAME}" != "debian" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} union=${LH_UNION_FILESYSTEM}"
fi
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+LH_BOOTAPPEND="`echo ${LH_BOOTAPPEND} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
@@ -184,7 +184,7 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+DEFAULT_FLAVOUR="`echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }'`"
DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
@@ -199,10 +199,10 @@ do
Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}" "${FAILSAFE}"
done
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_LIVE="`/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
LINUX_INSTALL="title\t\tInstaller:\nroot"
@@ -225,21 +225,21 @@ then
Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling memtest configuration
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
MEMTEST="title\t\tOther:\nroot"
- MEMTEST="${MEMTEST}\n\ntitle\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+ MEMTEST="${MEMTEST}\n\ntitle\t\t${LH_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
+ MEMTEST="`/bin/echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi
# Copying templates
mkdir -p binary/boot/grub
cp -r "${TEMPLATES}"/* binary/boot/grub
-case ${LIVE_BINARY_IMAGES} in
+case ${LH_BINARY_IMAGES} in
iso)
FILES="chroot/usr/lib/grub/*/stage2_eltorito"
;;
@@ -249,7 +249,7 @@ case ${LIVE_BINARY_IMAGES} in
;;
esac
-if [ "${LIVE_CHROOT_BUILD}" = "disabled" ]
+if [ "${LH_CHROOT_BUILD}" = "disabled" ]
then
FILES="`echo ${FILES} | sed -e 's/chroot//g'`"
fi
@@ -266,15 +266,15 @@ fi
# Copying splash screen
if [ -f config/binary_grub/splash.xpm.gz ]
then
- LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+ LH_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
elif [ -f config/binary_grub/splash.xpm ]
then
- LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm"
+ LH_GRUB_SPLASH="config/binary_grub/splash.xpm"
fi
-if [ -n "${LIVE_GRUB_SPLASH}" ]
+if [ -n "${LH_GRUB_SPLASH}" ]
then
- if [ "${LIVE_GRUB_SPLASH}" = "none" ]
+ if [ "${LH_GRUB_SPLASH}" = "none" ]
then
# Removing splash file
rm -f binary/boot/grub/splash.xpm.gz
@@ -283,13 +283,13 @@ then
sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
else
# Overwriting splash file
- cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub
- sed -i -e "s#splashimage.*#splashimage /boot/grub/`basename ${LIVE_GRUB_SPLASH}`#" binary/boot/grub/menu.lst
+ cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
+ sed -i -e "s#splashimage.*#splashimage /boot/grub/`basename ${LH_GRUB_SPLASH}`#" binary/boot/grub/menu.lst
fi
fi
sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" -e "s#MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
-sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
+sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" binary/boot/grub/menu.lst
sed -i -e 's/\ $//g' binary/boot/grub/menu.lst
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index bac2de2..b426a68 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_INCLUDES}" = "none" ]
+if [ "${LH_INCLUDES}" = "none" ]
then
exit 0
fi
@@ -52,25 +52,25 @@ Check_lockfile .lock
Create_lockfile .lock
# Check user includes
-if [ ! -d "${LIVE_INCLUDES}" ]
+if [ ! -d "${LH_INCLUDES}" ]
then
- if [ -d ../"${LIVE_INCLUDES}" ]
+ if [ -d ../"${LH_INCLUDES}" ]
then
- LIVE_INCLUDES="../${LIVE_INCLUDES}"
+ LH_INCLUDES="../${LH_INCLUDES}"
else
- Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
+ Echo_error "user specified includes not accessible in ${LH_INCLUDES}"
exit 1
fi
fi
# Checking local includes
-if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
+if [ -d config/includes/"${LH_DISTRIBUTION}" ]
then
- LIVE_INCLUDES="config/includes"
+ LH_INCLUDES="config/includes"
fi
# Assemble architecture
-case "${LIVE_ARCHITECTURE}" in
+case "${LH_ARCHITECTURE}" in
amd64)
ARCH="amd"
;;
@@ -85,57 +85,57 @@ case "${LIVE_ARCHITECTURE}" in
esac
# Working arround vfat limitations
-if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+if [ "${LH_BINARY_IMAGE}" = "usb-hdd" ]
then
CP_OPTIONS="-L"
fi
# Copying common templates
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* &> /dev/null
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common ] && \
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* > /dev/null 2>&1
then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* binary
+ cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* binary
fi
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}" ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* &> /dev/null
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}" ] && \
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* > /dev/null 2>&1
then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* binary
fi
# Copying live templates
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live ] && \
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* > /dev/null 2>&1
then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
+ cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* binary
fi
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}" ] && \
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* > /dev/null 2>&1
then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
fi
-if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
# Copying install templates
- if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
- ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+ if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
+ ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* > /dev/null 2>&1
then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+ cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
fi
- if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
- ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+ if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
+ ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* > /dev/null 2>&1
then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
fi
# Adjusting install templates
- ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
- DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
- DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
- eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+ ARCHITECTURE="`echo ${LH_ARCHITECTURE} | sed -e 's# #/#g'`"
+ DISTRIBUTION="`echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+ DISTRIBUTION="${DISTRIBUTION}`echo ${LH_DISTRIBUTION} | cut -b 2-`"
+ eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
if [ -d binary/pool/main/l/live-installer ]
then
@@ -147,7 +147,7 @@ then
DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`"
DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
- if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ if [ "${LH_ARCHITECTURE}" = "i386" ]
then
DEBIAN_TOOLS_HTML=" <P>\n <tt> \n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt> \n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
DEBIAN_TOOLS_TXT="/tools/ and /install/floppy/"
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index b39f31e..7da3da8 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
+if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso
then
exit 0
fi
@@ -71,33 +71,33 @@ then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
fi
-if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
fi
-if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
fi
-if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
fi
-if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
fi
# Create image
-case "${LIVE_BOOTLOADER}" in
+case "${LH_BOOTLOADER}" in
grub)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
fi
@@ -107,7 +107,7 @@ case "${LIVE_BOOTLOADER}" in
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
fi
@@ -116,7 +116,7 @@ case "${LIVE_BOOTLOADER}" in
yaboot)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map binary/yaboot/hfs.map --chrp-boot -part -no-desktop -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m yaboot/hfs.map"
fi
@@ -128,7 +128,7 @@ case "${LIVE_BOOTLOADER}" in
;;
esac
-case "${LIVE_CHROOT_BUILD}" in
+case "${LH_CHROOT_BUILD}" in
enabled)
# Moving image
mv binary chroot
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 9e4d74c..fb5ab98 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -47,7 +47,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso)
case "${LH_INITRAMFS}" in
casper)
@@ -68,14 +68,14 @@ case "${LIVE_BINARY_IMAGES}" in
DESTDIR="binary/live"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ if [ "${LH_DISTRIBUTION}" = "etch" ] && [ "${LH_BOOTLOADER}" = "syslinux" ]
then
DESTDIR="binary"
fi
;;
esac
-case "${LIVE_ARCHITECTURE}" in
+case "${LH_ARCHITECTURE}" in
amd64)
LINUX="vmlinuz"
;;
@@ -99,7 +99,7 @@ cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
cp chroot/boot/initrd.img-* "${DESTDIR}"
# Including boot parameter documentation
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+if [ "${LH_BINARY_IMAGES}" != "net" ]
then
DESTDIR="binary"
fi
diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes
index 862aea4..84434c5 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -54,7 +54,7 @@ then
cd "${OLDPWD}"
# Removing symlinks
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
find binary -type l | xargs rm -f
fi
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 586e362..28621f6 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_MEMTEST}" = "disabled" ]
+if [ "${LH_MEMTEST}" = "disabled" ]
then
exit 0
fi
@@ -51,13 +51,13 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+if [ "${LH_ARCHITECTURE}" != "amd64" ] && [ "${LH_ARCHITECTURE}" != "i386" ]
then
Echo_warning "skipping binary_memtest, foreign architecture."
exit 0
fi
-if [ "${LIVE_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "enabled" ]
then
if [ -f chroot/usr/sbin/grub ] && [ ! -d chroot/boot/grub ]
@@ -69,7 +69,7 @@ then
fi
# Checking depends
-case "${LIVE_MEMTEST}" in
+case "${LH_MEMTEST}" in
memtest86)
Check_package chroot/boot/memtest86.bin memtest86
;;
@@ -86,7 +86,7 @@ Restore_cache cache/packages_binary
Install_package
# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso)
case "${LH_INITRAMFS}" in
casper)
@@ -115,7 +115,7 @@ case "${LIVE_BINARY_IMAGES}" in
esac
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ if [ "${LH_DISTRIBUTION}" = "etch" ] && [ "${LH_BOOTLOADER}" = "syslinux" ]
then
DESTDIR="binary"
fi
@@ -128,13 +128,13 @@ Check_multiarchitecture
mkdir -p "${DESTDIR}"
# Installing memtest
-case "${LIVE_CHROOT_BUILD}" in
+case "${LH_CHROOT_BUILD}" in
enabled)
- cp chroot/boot/${LIVE_MEMTEST}.bin "${DESTDIR}"/memtest
+ cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
;;
disabled)
- cp /boot/${LIVE_MEMTEST}.bin "${DESTDIR}"/memtest
+ cp /boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
;;
esac
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 0347663..40286d4 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
+if ! echo "${LH_BINARY_IMAGES}" | grep -qs net
then
exit 0
fi
@@ -58,21 +58,21 @@ then
fi
# Creating image file
-if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+if [ "`basename ${LH_NET_PATH}`" = "chroot" ]
then
mv chroot chroot.tmp
fi
-mv binary "`basename ${LIVE_NET_PATH}`"
+mv binary "`basename ${LH_NET_PATH}`"
cd ..
-tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LH_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
mv binary-net.tar.gz "${OLDPWD}"
cd "${OLDPWD}"
-mv "`basename ${LIVE_NET_PATH}`" binary
+mv "`basename ${LH_NET_PATH}`" binary
-if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+if [ "`basename ${LH_NET_PATH}`" = "chroot" ]
then
mv chroot.tmp chroot
fi
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index e8f34c8..15feb5f 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -47,7 +47,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LIVE_ARCHITECTURE}" in
+case "${LH_ARCHITECTURE}" in
amd64|i386)
LINUX="vmlinuz"
;;
@@ -92,7 +92,7 @@ do
fi
done
-case "${LIVE_CHROOT_FILESYSTEM}" in
+case "${LH_CHROOT_FILESYSTEM}" in
ext2)
# Checking depends
Check_package chroot/usr/bin/genext2fs genext2fs
@@ -112,7 +112,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
DU_DIM="`du -ks chroot/chroot | cut -f1`"
REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
@@ -139,7 +139,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
rm -rf binary/${INITFS}/filesystem.dir
fi
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
mv chroot/chroot binary/${INITFS}/filesystem.dir
;;
@@ -166,7 +166,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
rm -f binary/${INITFS}/filesystem.squashfs
fi
- if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ]
+ if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LH_DISTRIBUTION}" != "testing" ]
then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
fi
@@ -176,7 +176,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
fi
- if [ "${LIVE_PACKAGES_LISTS}" = "minimal" ] || [ "${LIVE_PACKAGES_LISTS}" = "mini" ]
+ if [ "${LH_PACKAGES_LISTS}" = "minimal" ] || [ "${LH_PACKAGES_LISTS}" = "mini" ]
then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e `ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's,chroot/,,g'`"
fi
@@ -187,7 +187,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
cp config/binary_rootfs/squashfs.sort chroot #FIXME
fi
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
# Create image
Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index fd6d1cd..0568de9 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
+if [ "${LH_BOOTLOADER}" != "syslinux" ]
then
exit 0
fi
@@ -75,7 +75,7 @@ Syslinux_live_entry ()
APPEND="${4}"
# syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_LIVE}`" != "binary" ]
+ if [ "${LH_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_LIVE}`" != "binary" ]
then
DIRECTORY="`basename ${DESTDIR_LIVE}`"
KERNEL="${DIRECTORY}/${KERNEL}"
@@ -84,7 +84,7 @@ Syslinux_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
+ LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LH_BOOTAPPEND ${APPEND}\n"
}
Syslinux_install_entry ()
@@ -95,7 +95,7 @@ Syslinux_install_entry ()
APPEND="${4}"
# syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_INSTALL}`" != "binary" ]
+ if [ "${LH_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_INSTALL}`" != "binary" ]
then
DIRECTORY="`basename ${DESTDIR_INSTALL}`"
KERNEL="${DIRECTORY}/${KERNEL}"
@@ -103,7 +103,7 @@ Syslinux_install_entry ()
fi
# Boot in quiet mode
- if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ if [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
then
APPEND="${APPEND} quiet"
fi
@@ -124,7 +124,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso)
case "${LH_INITRAMFS}" in
casper)
@@ -158,7 +158,7 @@ case "${LIVE_BINARY_IMAGES}" in
DESTDIR_INSTALL="binary/install"
# syslinux << 3.36 lacks support for long file/path
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
then
DESTDIR_LIVE="binary"
DESTDIR_INSTALL="binary"
@@ -172,57 +172,57 @@ Check_multiarchitecture
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
+if [ -n "${LH_ENCRYPTION}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} encryption=${LH_ENCRYPTION}"
fi
-if [ -n "${LIVE_USERNAME}" ]
+if [ -n "${LH_USERNAME}" ]
then
case "${LH_INITRAMFS}" in
casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}"
;;
live-initramfs)
- if [ "${LIVE_USERNAME}" != "user" ]
+ if [ "${LH_USERNAME}" != "user" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LIVE_HOSTNAME}" ]
+if [ -n "${LH_HOSTNAME}" ]
then
case "${LH_INITRAMFS}" in
casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}"
;;
live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
+ if [ "${LH_HOSTNAME}" != "debian" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} union=${LH_UNION_FILESYSTEM}"
fi
-if [ "${LIVE_BINARY_IMAGES}" = "net" ]
+if [ "${LH_BINARY_IMAGES}" = "net" ]
then
- case "${LIVE_NET_FILESYSTEM}" in
+ case "${LH_NET_FILESYSTEM}" in
nfs)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} netboot=nfs nfsroot=LH_NET_SERVER:LH_NET_PATH"
;;
cifs)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=cifs nfsroot=//LIVE_NET_SERVERLIVE_NET_PATH"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} netboot=cifs nfsroot=//LH_NET_SERVERLH_NET_PATH"
;;
*)
@@ -231,13 +231,13 @@ then
;;
esac
- if [ -n "${LIVE_NET_MOUNTOPTIONS}" ]
+ if [ -n "${LH_NET_MOUNTOPTIONS}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} nfsopts=${LIVE_NET_MOUNTOPTIONS}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} nfsopts=${LH_NET_MOUNTOPTIONS}"
fi
fi
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+LH_BOOTAPPEND="`echo ${LH_BOOTAPPEND} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
@@ -245,14 +245,14 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+DEFAULT_FLAVOUR="`echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }'`"
DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
Syslinux_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+if [ "`echo ${LH_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinuz-*
do
@@ -265,10 +265,10 @@ then
done
fi
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_LIVE="`/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
@@ -279,9 +279,9 @@ then
APPEND_GI="video=vesa:ywrap,mtrr vga=788"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
then
- if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ if [ "${LH_BINARY_IMAGES}" = "tar" ] || [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
VMLINUZ_DI="vmlinuz.di"
INITRD_DI="initrddi.gz"
@@ -302,7 +302,7 @@ then
Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling memtest configuration
if [ -f "${DESTDIR_LIVE}"/memtest ]
@@ -316,15 +316,15 @@ then
fi
MEMTEST="LABEL memtest\n\tkernel ${KERNEL_PATH}memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+ MEMTEST="`/bin/echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso)
# Copying syslinux
mkdir -p binary/isolinux
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
;;
@@ -341,14 +341,14 @@ case "${LIVE_BINARY_IMAGES}" in
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
done
- if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
for FILE in binary/isolinux/*.install
do
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
done
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
then
for FILE in binary/isolinux/*.install.g-i
do
@@ -372,35 +372,35 @@ case "${LIVE_BINARY_IMAGES}" in
# Copying splash screen
if [ -f config/binary_syslinux/splash.rle ]
then
- LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+ LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
fi
- if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+ if [ -n "${LH_SYSLINUX_SPLASH}" ]
then
- if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+ if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
then
rm -f binary/isolinux/splash.rle
sed -e "s/.*splash.*//" binary/isolinux/boot.txt
else
- cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+ cp -f "${LH_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
fi
fi
# Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
- sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/CD-ROM/" binary/isolinux/f1.txt
- sed -i -e "s/LIVE_MEDIA/CD-ROM/" binary/isolinux/f3.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
+ sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
+ sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/CD-ROM/" binary/isolinux/f1.txt
+ sed -i -e "s/LH_MEDIA/CD-ROM/" binary/isolinux/f3.txt
+ sed -i -e "s/LH_VERSION/${VERSION}/" binary/isolinux/f10.txt
# Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ if [ "`echo ${LH_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
NUMBER="0"
# FIXME: This has a bug *iff* flavours = 686 686-bigmem (note the order).
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ for FLAVOUR in ${LH_LINUX_FLAVOURS}
do
NUMBER="$(($NUMBER + 1))"
@@ -409,11 +409,13 @@ case "${LIVE_BINARY_IMAGES}" in
sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" binary/isolinux/isolinux.cfg
done
else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
fi
+ sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" binary/isolinux/isolinux.cfg
+
# Remove whitespaces
sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg
;;
@@ -422,7 +424,7 @@ case "${LIVE_BINARY_IMAGES}" in
# Copying syslinux
mkdir -p tftpboot
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
;;
@@ -440,14 +442,14 @@ case "${LIVE_BINARY_IMAGES}" in
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
done
- if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
for FILE in tftpboot/pxelinux.cfg/*.install
do
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
done
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
then
for FILE in tftpboot/pxelinux.cfg/*.install.g-i
do
@@ -473,42 +475,44 @@ case "${LIVE_BINARY_IMAGES}" in
# Copying splash screen
if [ -f config/binary_syslinux/splash.rle ]
then
- LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+ LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
fi
- if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+ if [ -n "${LH_SYSLINUX_SPLASH}" ]
then
- if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+ if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
then
rm -f tftpboot/pxelinux.cfg/splash.rle
sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
else
- cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+ cp -f "${LH_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
fi
fi
# Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default
- sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt
- sed -i -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
+ sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" -e "s/LH_NET_SERVER/${LH_NET_SERVER}/" -e "s#LH_NET_PATH#${LH_NET_PATH}#" tftpboot/pxelinux.cfg/default
+ sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt
+ sed -i -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt
+ sed -i -e "s/LH_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
# Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
+ if [ "`echo ${LH_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
then
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
fi
+ sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" tftpboot/pxelinux.cfg/default
+
# Remove whitespaces
sed -i -e 's/\ $//g' tftpboot/pxelinux.cfg/default
;;
tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
then
DESTDIR="binary"
else
@@ -518,7 +522,7 @@ case "${LIVE_BINARY_IMAGES}" in
# Copying syslinux
mkdir -p "${DESTDIR}"
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
;;
@@ -535,14 +539,14 @@ case "${LIVE_BINARY_IMAGES}" in
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
done
- if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
for FILE in "${DESTDIR}"/*.install
do
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
done
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
then
for FILE in "${DESTDIR}"/*.install.g-i
do
@@ -564,33 +568,33 @@ case "${LIVE_BINARY_IMAGES}" in
# Copying splash screen
if [ -f config/binary_syslinux/splash.rle ]
then
- LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+ LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
fi
- if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+ if [ -n "${LH_SYSLINUX_SPLASH}" ]
then
- if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+ if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
then
rm -f "${DESTDIR}"/splash.rle
sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
else
- cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
+ cp -f "${LH_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
fi
fi
# Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
- sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME
- sed -i -e "s/LIVE_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME
- sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+ sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME
+ sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME
+ sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ if [ "`echo ${LH_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
NUMBER="0"
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ for FLAVOUR in ${LH_LINUX_FLAVOURS}
do
NUMBER="$(($NUMBER + 1))"
mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
@@ -598,9 +602,10 @@ case "${LIVE_BINARY_IMAGES}" in
sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" "${DESTDIR}"/syslinux.cfg
done
else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" "${DESTDIR}"/syslinux.cfg
# Remove whitespaces
sed -i -e 's/\ $//g' "${DESTDIR}"/syslinux.cfg
diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar
index e3ef167..3435935 100755
--- a/helpers/lh_binary_tar
+++ b/helpers/lh_binary_tar
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs tar
+if ! echo "${LH_BINARY_IMAGES}" | grep -qs tar
then
exit 0
fi
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index af4048c..f13896c 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
+if ! echo "${LH_BINARY_IMAGES}" | grep -qs usb-hdd
then
exit 0
fi
@@ -57,7 +57,7 @@ Check_package chroot/sbin/mkdosfs dosfstools
Check_package chroot/usr/share/doc/mtools mtools
Check_package chroot/sbin/parted parted
-case "${LIVE_BOOTLOADER}" in
+case "${LH_BOOTLOADER}" in
grub)
Check_package chroot/usr/sbin/grub grub
;;
@@ -95,14 +95,14 @@ fi
echo "!!! The following error/warning messages can be ignored !!!"
lh_losetup $FREELO chroot/binary.img 0
-case "${LIVE_CHROOT_BUILD}" in
+case "${LH_CHROOT_BUILD}" in
enabled)
Chroot "parted -s ${FREELO} mklabel msdos" || true
Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
Chroot "parted -s ${FREELO} set 1 boot on" || true
Chroot "parted -s ${FREELO} set 1 lba off" || true
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ if [ "${LH_BOOTLOADER}" = "syslinux" ]
then
cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
fi
@@ -114,7 +114,7 @@ case "${LIVE_CHROOT_BUILD}" in
parted -s ${FREELO} set 1 boot on || true
parted -s ${FREELO} set 1 lba off || true
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ if [ "${LH_BOOTLOADER}" = "syslinux" ]
then
cat /usr/lib/syslinux/mbr.bin > ${FREELO}
fi
@@ -126,7 +126,7 @@ ${LH_LOSETUP} -d ${FREELO}
FREELO="`${LH_LOSETUP} -f`"
lh_losetup $FREELO chroot/binary.img 1
-case "${LIVE_CHROOT_BUILD}" in
+case "${LH_CHROOT_BUILD}" in
enabled)
Chroot "mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
;;
@@ -142,7 +142,7 @@ cp -rL binary/* chroot/binary.tmp
FIXME()
{
-if [ "${LIVE_BOOTLOADER}" = "grub" ]
+if [ "${LH_BOOTLOADER}" = "grub" ]
then
cat > chroot/grub.sh << EOF
@@ -174,9 +174,9 @@ fi
${LH_ROOT_COMMAND} umount chroot/binary.tmp
rmdir chroot/binary.tmp
-if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+if [ "${LH_BOOTLOADER}" = "syslinux" ]
then
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
Chroot "syslinux ${FREELO}"
;;
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index c915e1d..dcdb839 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
+if [ "${LH_BOOTLOADER}" != "yaboot" ]
then
exit 0
fi
@@ -79,7 +79,7 @@ Yaboot_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\"\n"
+ LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} LH_BOOTAPPEND ${APPEND}\"\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
}
@@ -92,7 +92,7 @@ Yaboot_install_entry ()
DIRECTORY="/`basename ${DESTDIR_LIVE}`"
- if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ if [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
then
APPEND="${APPEND} quiet"
fi
@@ -100,7 +100,7 @@ Yaboot_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${LABEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"LIVE_BOOTAPPEND ${APPEND} --\"\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"LH_BOOTAPPEND ${APPEND} --\"\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
}
@@ -115,7 +115,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso)
case "${LH_INITRAMFS}" in
casper)
@@ -142,49 +142,49 @@ Check_multiarchitecture
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
+if [ -n "${LH_ENCRYPTION}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} encryption=${LH_ENCRYPTION}"
fi
-if [ -n "${LIVE_USERNAME}" ]
+if [ -n "${LH_USERNAME}" ]
then
case "${LH_INITRAMFS}" in
casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}"
;;
live-initramfs)
- if [ "${LIVE_USERNAME}" != "user" ]
+ if [ "${LH_USERNAME}" != "user" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LIVE_HOSTNAME}" ]
+if [ -n "${LH_HOSTNAME}" ]
then
case "${LH_INITRAMFS}" in
casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}"
;;
live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
+ if [ "${LH_HOSTNAME}" != "debian" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+ LH_BOOTAPPEND="${LH_BOOTAPPEND} union=${LH_UNION_FILESYSTEM}"
fi
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+LH_BOOTAPPEND="`echo ${LH_BOOTAPPEND} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
@@ -192,14 +192,14 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+DEFAULT_FLAVOUR="`echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }'`"
DEFAULT_KERNEL="`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinux-//'`"
Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+if [ "`echo ${LH_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinux-*
do
@@ -212,10 +212,10 @@ then
done
fi
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_LIVE="`/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
@@ -236,14 +236,14 @@ then
Yaboot_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
iso|usb-hdd)
# Copying yaboot
mkdir -p binary/yaboot
- case "${LIVE_CHROOT_BUILD}" in
+ case "${LH_CHROOT_BUILD}" in
enabled)
cp chroot/usr/lib/yaboot/yaboot binary/yaboot
;;
@@ -255,7 +255,7 @@ case "${LIVE_BINARY_IMAGES}" in
cp -r "${TEMPLATES}"/* binary/yaboot
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
echo "root=/dev/ram" > binary/yaboot/yaboot.conf
@@ -265,8 +265,8 @@ case "${LIVE_BINARY_IMAGES}" in
# Configure yaboot templates
sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" binary/yaboot/yaboot.conf
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
+ sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" binary/yaboot/yaboot.conf
+ sed -i -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_VERSION/${VERSION}/" binary/yaboot/boot.msg
;;
esac
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 31ffc77..37c8c79 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -58,22 +58,22 @@ Create_lockfile .lock
mkdir -p chroot
# Setting cdebootstrap options
-if [ -n "${LIVE_ARCHITECTURE}" ]
+if [ -n "${LH_ARCHITECTURE}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_ARCHITECTURE}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LH_ARCHITECTURE}"
fi
-if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
+if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LH_BOOTSTRAP_CONFIG}"
fi
-if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
+if [ -n "${LH_BOOTSTRAP_KEYRING}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
fi
-if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
+if [ "${LH_PACKAGES_LISTS}" != "minimal" ] && [ "${LH_PACKAGES_LISTS}" != "mini" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
else
@@ -106,7 +106,7 @@ then
fi
# Executing cdebootstrap (download-only)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -126,7 +126,7 @@ then
fi
# Executing cdebootstrap (regular run)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -134,7 +134,7 @@ then
fi
# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
- if [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "mini" ]
+ if [ "${LH_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LH_BOOTSTRAP_FLAVOUR}" = "mini" ]
then
Chroot "dpkg -P cdebootstrap-helper-diverts"
fi
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 4c0fd6e..ad71962 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -58,14 +58,14 @@ Create_lockfile .lock
mkdir -p chroot
# Setting debootstrap options
-if [ -n "${LIVE_ARCHITECTURE}" ]
+if [ -n "${LH_ARCHITECTURE}" ]
then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LIVE_ARCHITECTURE}"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
fi
-if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
+if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
then
- LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
+ LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
fi
if [ "${LH_VERBOSE}" = "true" ]
@@ -84,7 +84,7 @@ then
fi
# Executing debootstrap (download-only)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -104,7 +104,7 @@ then
fi
# Executing debootstrap (regular run)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index b89c2c9..2534efd 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -51,15 +51,15 @@ case "${1}" in
mkdir -p chroot/etc/apt/apt.conf.d
# Configuring apt ftp proxy
- if [ -n "${LH_APT_FTPPROXY}" ]
+ if [ -n "${LH_APT_FTP_PROXY}" ]
then
- echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
+ echo "Acquire::ftp::Proxy \"${LH_APT_FTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
fi
# Configuring apt http proxy
- if [ -n "${LH_APT_HTTPPROXY}" ]
+ if [ -n "${LH_APT_HTTP_PROXY}" ]
then
- echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
+ echo "Acquire::http::Proxy \"${LH_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
fi
# Configuring apt pdiffs
@@ -80,18 +80,17 @@ case "${1}" in
fi
# Configuring apt recommends
- if [ "${LH_APT}" = "aptitude" ]
- then
- case "${LH_APT_RECOMMENDS}" in
- enabled)
- echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
- ;;
-
- disabled)
- echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
- ;;
- esac
- fi
+ case "${LH_APT_RECOMMENDS}" in
+ enabled)
+ echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
+ echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
+ ;;
+
+ disabled)
+ echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
+ echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
+ ;;
+ esac
# Configuring apt secure
case "${LH_APT_SECURE}" in
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index cc9b431..a8ee989 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -49,7 +49,7 @@ Create_lockfile .lock
# Removing udev mac caching rule
Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
-case "${LIVE_BINARY_IMAGES}" in
+case "${LH_BINARY_IMAGES}" in
net)
if [ ! -f chroot/usr/bin/smbmount ]
then
@@ -80,6 +80,12 @@ EOF
;;
esac
+# Remove resume
+if [ "${LH_DISTRIBUTION}" = "etch" ] && [ -e /etc/initramfs-tools/conf.d/resume ]
+then
+ rm -f /etc/initramfs-tools/conf.d/resume
+fi
+
# Update initramfs
Chroot "update-initramfs -k all -t -u"
@@ -99,9 +105,9 @@ then
${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
fi
-if [ -d chroot/home/${LIVE_USERNAME} ]
+if [ -d chroot/home/${LH_USERNAME} ]
then
- chown -R --quiet 999:999 chroot/home/${LIVE_USERNAME}
+ chown -R --quiet 999:999 chroot/home/${LH_USERNAME}
fi
# Creating stage file
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index caa4fd3..3e1fc0d 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -47,7 +47,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing hooks
-for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+for HOOK in ${LH_PACKAGES_LISTS} ${LH_TASKS}
do
if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
then
@@ -71,7 +71,7 @@ do
fi
done
-if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
+if [ -n "${LH_HOOKS}" ] && [ "${LH_HOOKS}" != "none" ]
then
- LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
+ LH_DEBCONF_FRONTEND="readline" LH_DEBCONF_PRIORITY="low" LH_DEBCONF_NOWARNINGS="no" Chroot "${LH_HOOKS}"
fi
diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname
index be3b6af..7d04d68 100755
--- a/helpers/lh_chroot_hostname
+++ b/helpers/lh_chroot_hostname
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_hostname(1) - manage /etc/hostname
+# lh_chroot_hostname(1) - manage /bin/hostname
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -18,7 +18,7 @@ do
done
# Setting static variables
-DESCRIPTION="manage /etc/hostname"
+DESCRIPTION="manage /bin/hostname"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
@@ -48,17 +48,23 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ -f chroot/etc/hostname ]
- then
- # Save hostname file
- mv chroot/etc/hostname chroot/etc/hostname.orig
- fi
+ # Save hostname
+ mv chroot/bin/hostname chroot/bin/hostname.orig
# Create hostname file
echo "localhost.localdomain" > chroot/etc/hostname
- # Set hostname
- Chroot "hostname -F /etc/hostname"
+ Echo_message "Configuring file /bin/hostname"
+
+ # Create hostname program
+
+cat > chroot/bin/hostname << EOF
+#!/bin/sh
+
+echo "localhost.localdomain"
+EOF
+
+ chmod 755 chroot/bin/hostname
# Creating stage file
Create_stagefile .stage/chroot_hostname
@@ -73,20 +79,10 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ -f chroot/etc/hostname.orig ]
- then
- # Restore hostname file
- mv chroot/etc/hostname.orig chroot/etc/hostname
- else
- # Remove hostname file
- rm -f chroot/etc/hostname
- fi
-
- # Set hostname (somehow this seems to be really needed :/)
- if [ -f /etc/hostname ]
- then
- hostname -F /etc/hostname
- fi
+ Echo_message "Deconfiguring file /bin/hostname"
+
+ # Restore hostname file
+ mv chroot/bin/hostname.orig chroot/bin/hostname
# Removing stage file
rm -f .stage/chroot_hostname
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index 2a9417e..8c63e22 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_INTERACTIVE}" = "disabled" ]
+if [ "${LH_INTERACTIVE}" = "disabled" ]
then
exit 0
fi
@@ -51,7 +51,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LIVE_INTERACTIVE}" in
+case "${LH_INTERACTIVE}" in
enabled|shell)
echo "Pausing build: starting interactive shell..."
Chroot "/bin/bash --login"
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index c00d4c5..44bbfa5 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -70,11 +70,11 @@ EOF
# mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-helper
#fi
- if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
+ if [ "${LH_LINUX_PACKAGES}" != "none" ]
then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ for FLAVOUR in ${LH_LINUX_FLAVOURS}
do
- for PACKAGE in ${LIVE_LINUX_PACKAGES}
+ for PACKAGE in ${LH_LINUX_PACKAGES}
do
PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}"
done
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index c31072f..25e8d5f 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -47,9 +47,9 @@ Check_lockfile .lock
Create_lockfile .lock
# Setting localizations
-if [ -n "${LIVE_LANGUAGE}" ]
+if [ -n "${LH_LANGUAGE}" ]
then
- case "${LIVE_LANGUAGE}" in
+ case "${LH_LANGUAGE}" in
af)
# Afrikaans
LOCALIZATIONS="iceweasel kde openoffice"
@@ -601,45 +601,45 @@ then
esac
# Setting languages
- ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
- ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
- ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
- KDE="${KDE:-$LIVE_LANGUAGE}"
- KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
- OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
+ ICEAPE="${ICEAPE:-$LH_LANGUAGE}"
+ ICEDOVE="${ICEDOVE:-$LH_LANGUAGE}"
+ ICEWEASEL="${ICEWEASEL:-$LH_LANGUAGE}"
+ KDE="${KDE:-$LH_LANGUAGE}"
+ KOFFICE="${KOFFICE:-$LH_LANGUAGE}"
+ OPENOFFICE="${OPENOFFICE:-$LH_LANGUAGE}"
# Setting packages
for LOCALIZATION in ${LOCALIZATIONS}
do
case "${LOCALIZATION}" in
iceape)
- Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
+ Check_installed chroot/usr/bin/iceape iceape; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEAPE}"
;;
icedove)
- Check_package chroot/usr/bin/icedove icedove-locale-"${ICEDOVE}"
+ Check_installed chroot/usr/bin/icedove icedove; [ $INSTALL_STATUS -eq 0 ] && Check_package "" icedove-locale-"${ICEDOVE}"
;;
iceweasel)
- Check_package chroot/usr/bin/iceweasel iceweasel-l10n-"${ICEWEASEL}"
+ Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}"
;;
kde)
- Check_package chroot/usr/bin/kstart kde-i18n-"${KDE}"
+ Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}"
;;
koffice)
- Check_package chroot/usr/bin/usr/bin/koconverter koffice-i18n-"${KOFFICE}"
+ Check_installed chroot/usr/bin/koconverter koffice; [ $INSTALL_STATUS -eq 0 ] && Check_package "" koffice-i18n-"${KOFFICE}"
;;
openoffice)
- Check_package chroot/usr/bin/ooffice openoffice.org-l10n-"${OPENOFFICE}"
+ Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}"
;;
esac
done
- Check_package chroot/usr/bin/gwenview gwenview-i18n
- Check_package chroot/usr/bin/k3b k3b-i18n
+ Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
+ Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
# Restoring cache
Restore_cache cache/packages_localization
diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index bfc427c..87e8eaf 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
+if [ -n "${LH_PACKAGES}" ] && [ "${LH_PACKAGES}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_packages
@@ -54,11 +54,11 @@ then
# Installing packages
case "${LH_APT}" in
apt|apt-get)
- Chroot "apt-get install --yes ${LIVE_PACKAGES}"
+ Chroot "apt-get install --yes ${LH_PACKAGES}"
;;
aptitude)
- Chroot "aptitude install --assume-yes ${LIVE_PACKAGES}"
+ Chroot "aptitude install --assume-yes ${LH_PACKAGES}"
;;
esac
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index da796a7..2c21574 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -46,12 +46,12 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
+if [ -n "${LH_PACKAGES_LISTS}" ] && [ "${LH_PACKAGES_LISTS}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_packageslists
- for LIST in ${LIVE_PACKAGES_LISTS}
+ for LIST in ${LH_PACKAGES_LISTS}
do
if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
then
diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed
index 6e9cf91..55732ef 100755
--- a/helpers/lh_chroot_preseed
+++ b/helpers/lh_chroot_preseed
@@ -47,7 +47,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing preseeds
-for PRESEED in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+for PRESEED in ${LH_PACKAGES_LISTS} ${LH_TASKS}
do
if [ -f ${LH_BASE:-/usr/share/live-helper}/preseed/"${PRESEED}" ]
then
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 9d255f9..4e46ea9 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -49,34 +49,34 @@ case "${1}" in
Create_lockfile .lock
# Configure custom sources.list
- echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BOOTSTRAP} ${LH_DISTRIBUTION} ${LH_SECTIONS}" > chroot/etc/apt/sources.list
- if [ "${LIVE_SOURCE}" = "enabled" ]
+ if [ "${LH_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LH_MIRROR_BOOTSTRAP} ${LH_DISTRIBUTION} ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
fi
- if [ "${LIVE_SECURITY}" = "enabled" ]
+ if [ "${LH_SECURITY}" = "enabled" ]
then
case "${LH_MODE}" in
debian)
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- if [ "${LIVE_SOURCE}" = "enabled" ]
+ if [ "${LH_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
- echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- if [ "${LIVE_SOURCE}" = "enabled" ]
+ if [ "${LH_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
fi
;;
esac
@@ -175,9 +175,9 @@ case "${1}" in
fi
# Installing keyring packages
- if [ -n "${LIVE_KEYRING_PACKAGES}" ]
+ if [ -n "${LH_KEYRING_PACKAGES}" ]
then
- Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}"
+ Chroot "apt-get install --yes --force-yes ${LH_KEYRING_PACKAGES}"
Chroot "apt-get update"
fi
@@ -211,11 +211,11 @@ case "${1}" in
Create_lockfile .lock
# Configure generic indices
- if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
+ if [ "${LH_BINARY_INDICES}" = "enabled" ]
then
# Don't do anything if it's not required
- if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
- [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
+ if [ "${LH_MIRROR_BOOTSTRAP}" = "${LH_MIRROR_BINARY}" ] && \
+ [ "${LH_MIRROR_BOOTSTRAP_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ]
then
# Removing stage file
rm -f .stage/chroot_sources
@@ -227,34 +227,34 @@ case "${1}" in
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
- echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_SECTIONS}" > chroot/etc/apt/sources.list
- if [ "${LIVE_SOURCE}" = "enabled" ]
+ if [ "${LH_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
fi
- if [ "${LIVE_SECURITY}" = "enabled" ]
+ if [ "${LH_SECURITY}" = "enabled" ]
then
case "${LH_MODE}" in
debian)
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- if [ "${LIVE_SOURCE}" = "enabled" ]
+ if [ "${LH_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
- echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- if [ "${LIVE_SOURCE}" = "enabled" ]
+ if [ "${LH_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
fi
;;
esac
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index a7ceefe..4fffd14 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SYMLINKS}" != "enabled" ]
+if [ "${LH_SYMLINKS}" != "enabled" ]
then
exit 0
fi
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index ca45aff..ffed709 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LIVE_SYSVINIT}" = "enabled" ]
+if [ "${LH_SYSVINIT}" = "enabled" ]
then
# Disable all
for FILE in chroot/etc/init.d/*
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 704f3d4..49f44b6 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
+if [ -n "${LH_TASKS}" ] && [ "${LH_TASKS}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_tasks
@@ -68,11 +68,11 @@ then
# Installing tasks
case "${LH_TASKSEL}" in
aptitude)
- Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
+ Chroot "aptitude install --assume-yes ${LH_TASKS}"
;;
tasksel)
- for TASK in ${LIVE_TASKS}
+ for TASK in ${LH_TASKS}
do
Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
done
diff --git a/helpers/lh_config b/helpers/lh_config
index 41c0432..60e8530 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -19,60 +19,505 @@ done
# Setting static variables
DESCRIPTION="create configuration for live-helper(7)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
+HELP="FIXME"
+USAGE="${PROGRAM} [--apt apt|aptitude] [--apt-ftp-proxy URL] [--apt-http-proxy URL] [--apt-pdiffs enabled|disabled] [--apt-pipeline FIXME] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [-a|--architecture ARCHITECTURE] [-b|--binary-images iso|net|tar|usb-hdd] [--binary-indices enabled|disabled] [--bootappend PARAMETER|\"PARAMETERS\"] [--bootloader grub|syslinux|yaboot] [--bootstrap cdebootstrap|debootstrap] [--bootstrap-config FILE] [-f|--bootstrap-flavour minimal|standard] [--bootstrap-keyring PACKAGE] [--breakpoints] [--cache enabled|disabled] [--cache-indices enabled|disabled] [--cache-packages enabled|disabled] [--cache-stages STAGE|\"STAGES\"] [--chroot-build enabled|disabled] [--chroot-filesystem ext2|ext3|squashfs|plain] [-c|--conffile FILE] [--debconf-frontend dialog|editor|noninteractive|readline] [--debconf-nowarnings enabled|disabled] [--debconf-priority low|medium|high|critical] [--debian-installer enabled|disabled] [--debug] [-d|--distribution CODENAME] [-e|--encryption aes128|aes192|aes256] [--force] [--genisoimage genisomage|mkisofs] [--grub-splash FILE] [--hooks FILE] [--hostname NAME] [--includes PATH] [--initramfs auto|live-initramfs|casper] [--interactive shell] [--iso-application NAME] [--iso-preparer NAME] [--iso-publisher NAME] [--iso-volume NAME] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"] [--linux-packages \"PACKAGES\"] [--losetup losetup|losetup.orig] [--memtest memtest86+|memtest86] [-m|--mirror-binary-security URL] [--mirror-binary URL] [--mirror-bootstrap-security URL] [--mirror-bootstrap URL] [--mode debian|debian-edu|ubuntu] [--net-filesystem nfs|cfs] [--net-mountoptions OPTIONS] [--net-path PATH] [--net-server IP|HOSTNAME] [-p|--packages-lists FILE] [--packages PACKAGE|\"PACKAGES\"] [--quiet] [--root-command sudo] [--sections SECTION|\"SECTIONS\"] [--security enabled|disabled] [--source enabled|disabled] [-s|--source-images iso|net|tar|usb-hdd] [--symlinks enabled|disabled] [--syslinux-splash FILE] [--syslinux-timeout MILISECONDS] [--sysvinit enabled|disabled] [--tasksel aptitude|tasksel] [--tasks TASK] [--templates PATH] [--union-filesystem aufs|unionfs] [--username NAME] [--verbose]"
-Arguments "${@}"
+Local_arguments ()
+{
+ ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}"`"
-CONFIG="${1}"
-
-if [ -n "${LH_CONFIG}" ]
-then
- if [ -d ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
+ if [ "${?}" != "0" ]
then
- mkdir "${LH_CONFIG}"
- cp -r ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
-
- LIVE_ROOT="${LH_CONFIG}"
- CONFIG=""
- else
- Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE:-/usr/share/live-helper}/configs/."
+ Echo_error "terminating" >&2
+ exit 1
fi
-fi
-if [ "${CONFIG}" != "newconfig" ]
-then
- # Source existing configuration
- Read_conffile "${LIVE_ROOT}"/config/common
- Read_conffile "${LIVE_ROOT}"/config/bootstrap
- Read_conffile "${LIVE_ROOT}"/config/chroot
- Read_conffile "${LIVE_ROOT}"/config/binary
- Read_conffile "${LIVE_ROOT}"/config/source
-fi
+ eval set -- "${ARGUMENTS}"
+
+ while true
+ do
+ case "${1}" in
+ # config/common
+ --apt)
+ LH_APT="${2}"
+ shift 2
+ ;;
+
+ --apt-ftp-proxy)
+ LH_APT_FTP_PROXY="${2}"
+ shift 2
+ ;;
+
+ --apt-http-proxy)
+ LH_APT_HTTP_PROXY="${2}"
+ shift 2
+ ;;
+
+ --apt-pdiffs)
+ LH_APT_PDIFFS="${2}"
+ shift 2
+ ;;
+
+ --apt-pipeline)
+ LH_APT_PIPELINE="${2}"
+ shift 2
+ ;;
+
+ --apt-recommends)
+ LH_APT_RECOMMENDS="${2}"
+ shift 2
+ ;;
+
+ --apt-secure)
+ LH_APT_SECURE="${2}"
+ shift 2
+ ;;
+
+ --bootstrap)
+ LH_BOOTSTRAP="${2}"
+ shift 2
+ ;;
+
+ --cache)
+ LH_CACHE="${2}"
+ shift 2
+ ;;
+
+ --cache-indices)
+ LH_CACHE_INDICES="${2}"
+ shift 2
+ ;;
+
+ --cache-packages)
+ LH_CACHE_PACKAGES="${2}"
+ shift 2
+ ;;
+
+ --cache-stages)
+ LH_CACHE_STAGES="${2}"
+ shift 2
+ ;;
+
+ --debconf-frontend)
+ LH_DEBCONF_FRONTEND="${2}"
+ shift 2
+ ;;
+
+ --debconf-nowarnings)
+ LH_DEBCONF_NOWARNINGS="${2}"
+ shift 2
+ ;;
+
+ --debconf-priority)
+ LH_DEBCONF_PRIORITY="${2}"
+ shift 2
+ ;;
+
+ --genisoimage)
+ LH_GENISOIMAGE="${2}"
+ shift 2
+ ;;
+
+ --initramfs)
+ LH_INITRAMFS="${2}"
+ shift 2
+ ;;
+
+ --losetup)
+ LH_LOSETUP="${2}"
+ shift 2
+ ;;
+
+ --mode)
+ LH_MODE="${2}"
+ shift 2
+ ;;
+
+ --root-command)
+ LH_ROOT_COMMAND="${2}"
+ shift 2
+ ;;
+
+ --tasksel)
+ LH_TASKSEL="${2}"
+ shift 2
+ ;;
+
+ --includes)
+ LH_INCLUDES="${2}"
+ shift 2
+ ;;
+
+ --templates)
+ LH_TEMPLATES="${2}"
+ shift 2
+ ;;
+
+ --breakpoints)
+ LH_BREAKPOINTS="enabled"
+ shift
+ ;;
+
+ --debug)
+ LH_DEBUG="enabled"
+ shift
+ ;;
+
+ --force)
+ LH_FORCE="enabled"
+ shift
+ ;;
+
+ --quiet)
+ LH_QUIET="enabled"
+ shift
+ ;;
+
+ --verbose)
+ LH_VERBOSE="enabled"
+ shift
+ ;;
+
+ -v|--version)
+ Version
+ shift
+ ;;
+
+ # config/bootstrap
+ -a|--architecture)
+ LH_ARCHITECTURE="${2}"
+ shift 2
+ ;;
+
+ --bootstrap-config)
+ LH_BOOTSTRAP_CONFIG="${2}"
+ shift 2
+ ;;
+
+ -f|--bootstrap-flavour)
+ LH_BOOTSTRAP_FLAVOUR="${2}"
+ shift 2
+ ;;
+
+ --bootstrap-keyring)
+ LH_BOOTSTRAP_KEYRING="${2}"
+ shift 2
+ ;;
+
+ -d|--distribution)
+ LH_DISTRIBUTION="${2}"
+ shift 2
+ ;;
+
+ -m|--mirror-bootstrap)
+ LH_MIRROR_BOOTSTRAP="${2}"
+ shift 2
+ ;;
+
+ --mirror-bootstrap-security)
+ LH_MIRROR_BOOTSTRAP_SECURITY="${2}"
+ shift 2
+ ;;
+
+ --mirror-binary)
+ LH_MIRROR_BINARY="${2}"
+ shift 2
+ ;;
+
+ --mirror-binary-security)
+ LH_MIRROR_BINARY_SECURITY="${2}"
+ shift 2
+ ;;
+
+ --sections)
+ LH_SECTIONS="${2}"
+ shift 2
+ ;;
+
+ # config/chroot
+ --chroot-filesystem)
+ LH_CHROOT_FILESYSTEM="${2}"
+ shift 2
+ ;;
+
+ --union-filesystem)
+ LH_UNION_FILESYSTEM="${2}"
+ shift 2
+ ;;
+
+ --hooks)
+ LH_HOOKS="${2}"
+ shift 2
+ ;;
+
+ --interactive)
+ LH_INTERACTIVE="${2}"
+ shift 2
+ ;;
+
+ --keyring-packages)
+ LH_KEYRING_PACKAGES="${2}"
+ shift 2
+ ;;
+
+ -l|--language)
+ LH_LANGUAGE="${2}"
+ shift 2
+ ;;
+
+ -k|--linux-flavours)
+ LH_LINUX_FLAVOURS="${2}"
+ shift 2
+ ;;
+
+ --linux-packages)
+ LH_LINUX_PACKAGES="${2}"
+ shift 2
+ ;;
+
+ --packages)
+ LH_PACKAGES="${2}"
+ shift 2
+ ;;
+
+ -p|--packages-lists)
+ LH_PACKAGES_LISTS="${2}"
+ shift 2
+ ;;
+
+ --tasks)
+ LH_TASKS="${2}"
+ shift 2
+ ;;
+
+ --security)
+ LH_SECURITY="${2}"
+ shift 2
+ ;;
+
+ --symlinks)
+ LH_SYMLINKS="${2}"
+ shift 2
+ ;;
+
+ --sysvinit)
+ LH_SYSVINIT="${2}"
+ shift 2
+ ;;
+
+ # config/binary
+ -b|--binary-images)
+ LH_BINARY_IMAGES="${2}"
+ shift 2
+ ;;
+
+ --binary-indices)
+ LH_BINARY_INDICES="${2}"
+ shift 2
+ ;;
+
+ --bootappend)
+ LH_BOOTAPPEND="${2}"
+ shift 2
+ ;;
+
+ --bootloader)
+ LH_BOOTLOADER="${2}"
+ shift 2
+ ;;
+
+ --chroot-build)
+ LH_CHROOT_BUILD="${2}"
+ shift 2
+ ;;
+
+ --debian-installer)
+ LH_DEBIAN_INSTALLER="${2}"
+ shift 2
+ ;;
+
+ -e|--encryption)
+ LH_ENCRYPTION="${2}"
+ shift 2
+ ;;
+
+ --grub-splash)
+ LH_GRUB_SPLASH="${2}"
+ shift 2
+ ;;
+
+ --hostname)
+ LH_HOSTNAME="${2}"
+ shift 2
+ ;;
+
+ --iso-application)
+ LH_ISO_APPLICATION="${2}"
+ shift 2
+ ;;
+
+ --iso-preparer)
+ LH_ISO_PREPARER="${2}"
+ shift 2
+ ;;
+
+ --iso-publisher)
+ LH_ISO_PUBLISHER="${2}"
+ shift 2
+ ;;
+
+ --iso-volume)
+ LH_ISO_VOLUME="${2}"
+ shift 2
+ ;;
+
+ --iso-memtest)
+ LH_ISO_MEMTEST="${2}"
+ shift 2
+ ;;
+
+ --net-filesystem)
+ LH_NET_FILESYSTEM="${2}"
+ shift 2
+ ;;
+
+ --net-mountoptions)
+ LH_NET_MOUNTOPTIONS="${2}"
+ shift 2
+ ;;
+
+ --net-path)
+ LH_NET_PATH="${2}"
+ shift 2
+ ;;
+
+ --net-server)
+ LH_NET_SERVER="${2}"
+ shift 2
+ ;;
+
+ --syslinux-splash)
+ LH_SYSLINUX_SPLASH="${2}"
+ shift 2
+ ;;
+
+ --syslinux-timeout)
+ LH_SYSLINUX_TIMEOUT="${2}"
+ shift 2
+ ;;
+
+ --username)
+ LH_USERNAME="${2}"
+ shift 2
+ ;;
+
+ # config/source
+ --source)
+ LH_SOURCE="${2}"
+ shift 2
+ ;;
+
+ -s|--source-images)
+ LH_SOURCE_IMAGES="${2}"
+ shift 2
+ ;;
+
+ # other
+ --breakpoints)
+ LH_BREAKPOINTS="enabled"
+ shift
+ ;;
+
+ -c|-conffile)
+ LH_CONFFILE="${2}"
+ shift 2
+ ;;
+
+ --debug)
+ LH_DEBUG="enabled"
+ shift
+ ;;
+
+ --force)
+ LH_FORCE="enabled"
+ shift
+ ;;
+
+ -h|--help)
+ Help
+ shift
+ ;;
+
+ --quiet)
+ LH_QUIET="enabled"
+ shift
+ ;;
+
+ -u|--usage)
+ Usage
+ shift
+ ;;
+
+ --verbose)
+ LH_VERBOSE="enabled"
+ shift
+ ;;
+
+ -v|--version)
+ Version
+ shift
+ ;;
+
+ --)
+ shift
+ break
+ ;;
+
+ *)
+ Echo_error "internal error"
+ exit 1
+ ;;
+ esac
+ done
+}
+
+# Reading existing configuration
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
# Setting defaults
Set_defaults
+Local_arguments "${@}"
+
+if [ -n "${LH_CONFFILE}" ]
+then
+ Read_conffile "${LH_CONFFILE}"
+fi
+
# Creating bootstrap configuration
-mkdir -p "${LIVE_ROOT}"/config
-mkdir -p "${LIVE_ROOT}"/config/includes
-mkdir -p "${LIVE_ROOT}"/config/templates
+mkdir -p config
+mkdir -p config/includes
+mkdir -p config/templates
# Creating live-helper configuration
-cat > "${LIVE_ROOT}"/config/common << EOF
+cat > config/common << EOF
# config/common - common options for live-helper(7)
# \$LH_APT: set package manager
# (Default: ${LH_APT})
LH_APT="${LH_APT}"
-# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
+# \$LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
# (Default: autodetected or empty)
-LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
+LH_APT_FTP_PROXY="${LH_APT_FTP_PROXY}"
-# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
+# \$LH_APT_HTTP_PROXY: set apt/aptitude http proxy
# (Default: autodetected or empty)
-LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
+LH_APT_HTTP_PROXY="${LH_APT_HTTP_PROXY}"
# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
# (Default: ${LH_APT_PDIFFS})
@@ -94,6 +539,10 @@ LH_APT_SECURE="${LH_APT_SECURE}"
# (Default: ${LH_BOOTSTRAP})
LH_BOOTSTRAP="${LH_BOOTSTRAP}"
+# \$LH_CACHE: control cache
+# (Default: ${LH_CACHE})
+LH_CACHE="${LH_CACHE}"
+
# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
# (Default: ${LH_CACHE_INDICES})
LH_CACHE_INDICES="${LH_CACHE_INDICES}"
@@ -142,17 +591,13 @@ LH_MODE="${LH_MODE}"
# (Default: ${LH_TASKSEL})
LH_TASKSEL="${LH_TASKSEL}"
-# \$LIVE_ROOT: set root directory
-# (Default: ${LIVE_ROOT})
-LIVE_ROOT="${LIVE_ROOT}"
-
-# \$LIVE_INCLUDES: set includes
-# (Default: ${LIVE_INCLUDES})
-LIVE_INCLUDES="${LIVE_INCLUDES}"
+# \$LH_INCLUDES: set includes
+# (Default: ${LH_INCLUDES})
+LH_INCLUDES="${LH_INCLUDES}"
-# \$LIVE_TEMPLATES: set templates
-# (Default: ${LIVE_TEMPLATES})
-LIVE_TEMPLATES="${LIVE_TEMPLATES}"
+# \$LH_TEMPLATES: set templates
+# (Default: ${LH_TEMPLATES})
+LH_TEMPLATES="${LH_TEMPLATES}"
# Live-helper options
@@ -178,225 +623,225 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}"
EOF
# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
+cat > config/bootstrap << EOF
# config/bootstrap - options for live-helper(7), bootstrap stage
-# \$LIVE_ARCHITECTURE: select chroot architecture
+# \$LH_ARCHITECTURE: select chroot architecture
# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
+LH_ARCHITECTURE="${LH_ARCHITECTURE}"
-# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# \$LH_BOOTSTRAP_CONFIG: set distribution config directory
# (Default: empty)
-LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
+LH_BOOTSTRAP_CONFIG="${LH_BOOTSTRAP_CONFIG}"
-# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+# \$LH_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: ${LH_BOOTSTRAP_FLAVOUR})
+LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR}"
-# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# \$LH_BOOTSTRAP_KEYRING: set distribution keyring
# (Default: empty)
-LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+LH_BOOTSTRAP_KEYRING="${LH_BOOTSTRAP_KEYRING}"
-# \$LIVE_DISTRIBUTION: select distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
+# \$LH_DISTRIBUTION: select distribution to use
+# (Default: ${LH_DISTRIBUTION})
+LH_DISTRIBUTION="${LH_DISTRIBUTION}"
-# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP})
-LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
+# \$LH_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: ${LH_MIRROR_BOOTSTRAP})
+LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
-# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
-LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
+# \$LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: ${LH_MIRROR_BOOTSTRAP_SECURITY})
+LH_MIRROR_BOOTSTRAP_SECURITY="${LH_MIRROR_BOOTSTRAP_SECURITY}"
-# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY})
-LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
+# \$LH_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LH_MIRROR_BINARY})
+LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
-# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
-LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
+# \$LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LH_MIRROR_BINARY_SECURITY})
+LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
-# \$LIVE_SECTIONS: select section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
+# \$LH_SECTIONS: select section(s) to use
+# (Default: ${LH_SECTIONS})
+LH_SECTIONS="${LH_SECTIONS}"
EOF
# Creating lh_chroot_* configuration
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+mkdir -p config/chroot_local-hooks
+mkdir -p config/chroot_local-includes
+mkdir -p config/chroot_local-packages
+mkdir -p config/chroot_local-packageslists
+mkdir -p config/chroot_sources
-cat > "${LIVE_ROOT}"/config/chroot << EOF
+cat > config/chroot << EOF
# config/chroot - options for live-helper(7), chroot stage
-# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: ${LIVE_CHROOT_FILESYSTEM})
-LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+# \$LH_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LH_CHROOT_FILESYSTEM})
+LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
-# \$LIVE_UNION_FILESYSTEM: set union filesystem
-# (Default: ${LIVE_UNION_FILESYSTEM}
-LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM}"
+# \$LH_UNION_FILESYSTEM: set union filesystem
+# (Default: ${LH_UNION_FILESYSTEM}
+LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM}"
-# \$LIVE_HOOKS: set hook commands
+# \$LH_HOOKS: set hook commands
# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
+LH_HOOKS="${LH_HOOKS}"
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
+# \$LH_INTERACTIVE: set interactive build
+# (Default: ${LH_INTERACTIVE})
+LH_INTERACTIVE="${LH_INTERACTIVE}"
-# \$LIVE_KEYRING_PACKAGES: set keyring packages
+# \$LH_KEYRING_PACKAGES: set keyring packages
# (Default: empty)
-LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
+LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES}"
-# \$LIVE_LANGUAGE: set language to use
+# \$LH_LANGUAGE: set language to use
# (Default: empty)
-LIVE_LANGUAGE="${LIVE_LANGUAGE}"
+LH_LANGUAGE="${LH_LANGUAGE}"
-# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# \$LH_LINUX_FLAVOURS: set kernel flavour to use
# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
+LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
-# \$LIVE_LINUX_PACKAGES: set kernel packages to use
+# \$LH_LINUX_PACKAGES: set kernel packages to use
# (Default: autodetected)
-LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
+LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES}"
-# \$LIVE_PACKAGES: set packages to install
+# \$LH_PACKAGES: set packages to install
# (Default: empty)
-LIVE_PACKAGES="${LIVE_PACKAGES}"
+LH_PACKAGES="${LH_PACKAGES}"
-# \$LIVE_PACKAGES_LISTS: set package list to install
-# (Default: ${LIVE_PACKAGES_LISTS})
-LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
+# \$LH_PACKAGES_LISTS: set package list to install
+# (Default: ${LH_PACKAGES_LISTS})
+LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
-# \$LIVE_TASKS: set tasks to install
+# \$LH_TASKS: set tasks to install
# (Default: empty)
-LIVE_TASKS="${LIVE_TASKS}"
+LH_TASKS="${LH_TASKS}"
-# \$LIVE_SECURITY: enable security updates
-# (Default: ${LIVE_SECURITY})
-LIVE_SECURITY="${LIVE_SECURITY}"
+# \$LH_SECURITY: enable security updates
+# (Default: ${LH_SECURITY})
+LH_SECURITY="${LH_SECURITY}"
-# \$LIVE_SYMLINKS: enable symlink convertion
-# (Default: ${LIVE_SYMLINKS})
-LIVE_SYMLINKS="${LIVE_SYMLINKS}"
+# \$LH_SYMLINKS: enable symlink convertion
+# (Default: ${LH_SYMLINKS})
+LH_SYMLINKS="${LH_SYMLINKS}"
-# \$LIVE_SYSVINIT: enable sysvinit
-# (Default: ${LIVE_SYSVINIT})
-LIVE_SYSVINIT="${LIVE_SYSVINIT}"
+# \$LH_SYSVINIT: enable sysvinit
+# (Default: ${LH_SYSVINIT})
+LH_SYSVINIT="${LH_SYSVINIT}"
EOF
# Creating lh_binary_* configuration
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_local-debs
-mkdir -p "${LIVE_ROOT}"/config/binary_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
-mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs
-mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
-
-cat > "${LIVE_ROOT}"/config/binary << EOF
+mkdir -p config/binary_grub
+mkdir -p config/binary_local-debs
+mkdir -p config/binary_local-hooks
+mkdir -p config/binary_local-includes
+mkdir -p config/binary_local-udebs
+mkdir -p config/binary_rootfs
+mkdir -p config/binary_syslinux
+
+cat > config/binary << EOF
# config/binary - options for live-helper(7), binary stage
-# \$LIVE_BINARY_IMAGES: set image type
-# (Default: ${LIVE_BINARY_IMAGES})
-LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
+# \$LH_BINARY_IMAGES: set image type
+# (Default: ${LH_BINARY_IMAGES})
+LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
-# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LIVE_BINARY_INDICES})
-LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
+# \$LH_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LH_BINARY_INDICES})
+LH_BINARY_INDICES="${LH_BINARY_INDICES}"
-# \$LIVE_BOOTAPPEND: set boot parameters
+# \$LH_BOOTAPPEND: set boot parameters
# (Default: empty)
-LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
+LH_BOOTAPPEND="${LH_BOOTAPPEND}"
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+# \$LH_BOOTLOADER: set bootloader
+# (Default: ${LH_BOOTLOADER})
+LH_BOOTLOADER="${LH_BOOTLOADER}"
-# \${LIVE_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: ${LIVE_CHROOT_BUILD})
+# \${LH_CHROOT_BUILD: control if we build binary images chrooted
+# (Default: ${LH_CHROOT_BUILD})
# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD}"
+LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
-# \$LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LIVE_DEBIAN_INSTALLER})
-LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+# \$LH_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LH_DEBIAN_INSTALLER})
+LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
-# \$LIVE_ENCRYPTION: set encrytion
+# \$LH_ENCRYPTION: set encrytion
# (Default: empty)
-LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
+LH_ENCRYPTION="${LH_ENCRYPTION}"
-# \$LIVE_GRUB_SPLASH: set custom grub splash
+# \$LH_GRUB_SPLASH: set custom grub splash
# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
+LH_GRUB_SPLASH="${LH_GRUB_SPLASH}"
-# \$LIVE_HOSTNAME: set hostname
-# (Default: ${LIVE_HOSTNAME})
-LIVE_HOSTNAME="${LIVE_HOSTNAME}"
+# \$LH_HOSTNAME: set hostname
+# (Default: ${LH_HOSTNAME})
+LH_HOSTNAME="${LH_HOSTNAME}"
-# \$LIVE_ISO_APPLICATION: set iso author
-# (Default: ${LIVE_ISO_APPLICATION})
-LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
+# \$LH_ISO_APPLICATION: set iso author
+# (Default: ${LH_ISO_APPLICATION})
+LH_ISO_APPLICATION="${LH_ISO_APPLICATION}"
-# \$LIVE_ISO_PREPARER: set iso preparer
-# (Default: ${LIVE_ISO_PREPARER})
-LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
+# \$LH_ISO_PREPARER: set iso preparer
+# (Default: ${LH_ISO_PREPARER})
+LH_ISO_PREPARER="${LH_ISO_PREPARER}"
-# \$LIVE_ISO_PUBLISHER: set iso preparer
-# (Default: ${LIVE_ISO_PUBLISHER})
-LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
+# \$LH_ISO_PUBLISHER: set iso preparer
+# (Default: ${LH_ISO_PUBLISHER})
+LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
-# \$LIVE_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: ${LIVE_ISO_VOLUME})
-LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
+# \$LH_ISO_VOLUME: set iso volume (max 32 chars)
+# (Default: ${LH_ISO_VOLUME})
+LH_ISO_VOLUME="${LH_ISO_VOLUME}"
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
+# \$LH_MEMTEST: set memtest
+# (Default: ${LH_MEMTEST})
+LH_MEMTEST="${LH_MEMTEST}"
-# \$LIVE_NET_FILESYSTEM: set netboot filesystem
-# (Default: ${LIVE_NET_FILESYSTEM})
-LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM}"
+# \$LH_NET_FILESYSTEM: set netboot filesystem
+# (Default: ${LH_NET_FILESYSTEM})
+LH_NET_FILESYSTEM="${LH_NET_FILESYSTEM}"
-# \$LIVE_NET_MOUNTOPTIONS: set nfsopts
+# \$LH_NET_MOUNTOPTIONS: set nfsopts
# (Default: empty)
-LIVE_NET_MOUNTOPTIONS="${LIVE_NET_MOUNTOPTIONS}"
+LH_NET_MOUNTOPTIONS="${LH_NET_MOUNTOPTIONS}"
-# \$LIVE_NET_PATH: set netboot server directory
-# (Default: ${LIVE_NET_PATH})
-LIVE_NET_PATH="${LIVE_NET_PATH}"
+# \$LH_NET_PATH: set netboot server directory
+# (Default: ${LH_NET_PATH})
+LH_NET_PATH="${LH_NET_PATH}"
-# \$LIVE_NET_SERVER: set netboot server address
-# (Default: ${LIVE_NET_SERVER})
-LIVE_NET_SERVER="${LIVE_NET_SERVER}"
+# \$LH_NET_SERVER: set netboot server address
+# (Default: ${LH_NET_SERVER})
+LH_NET_SERVER="${LH_NET_SERVER}"
-# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# \$LH_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
-LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
+LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
+# \$LH_USERNAME: set username
+# (Default: ${LH_USERNAME})
+LH_USERNAME="${LH_USERNAME}"
EOF
# Creating lh_source_* configuration
-cat > "${LIVE_ROOT}"/config/source << EOF
+cat > config/source << EOF
# config/source - options for live-helper(7), source stage
-# \$LIVE_SOURCE: set source option
-# (Default: ${LIVE_SOURCE})
-LIVE_SOURCE="${LIVE_SOURCE}"
+# \$LH_SOURCE: set source option
+# (Default: ${LH_SOURCE})
+LH_SOURCE="${LH_SOURCE}"
-# \$LIVE_SOURCE_IMAGES: set image type
-# (Default: ${LIVE_SOURCE_IMAGES})
-LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
+# \$LH_SOURCE_IMAGES: set image type
+# (Default: ${LH_SOURCE_IMAGES})
+LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
EOF
-if [ "${CONFIG}" = "clone" ]
+if [ "${CONFIG}" = "clone" ] # FIXME
then
# Read package selection
echo `dpkg --get-selections | awk '{ print $1 }'` > config/chroot_local-packageslists/local-system
diff --git a/helpers/lh_losetup b/helpers/lh_losetup
index c2c7a7b..8ef33c9 100755
--- a/helpers/lh_losetup
+++ b/helpers/lh_losetup
@@ -20,7 +20,7 @@ done
# Setting static variables
DESCRIPTION="wrapper around losetup"
HELP=""
-USAGE="${PROGRAM} <device> <file> <partition>"
+USAGE="${PROGRAM} DEVICE FILE [PARTITION]"
Arguments "${@}"
@@ -32,30 +32,26 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ -z "${1}" ]
-then
- DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
-else
- DEVICE="${1}"
-fi
-
+DEVICE="${1}"
FILE="${2}"
-PARTITION="${3}"
+PARTITION="${3:=1}"
${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
-LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
-CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`
-#OFFSET="`expr 512 '*' ${CYL}`"
-OFFSET="$((CYL*512))"
-
-echo loop $DEVICE at offset $OFFSET
+LOOPDEVICE="`echo ${DEVICE}p${PARTITION}`"
if [ "${PARTITION}" = "0" ]
then
+ Echo_message "Mounting ${DEVICE} with offset 0"
+
${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
else
+ CYLINDERS="`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`"
+ OFFSET="`expr ${CYLINDERS} '*' 512`"
+
+ Echo_message "Mounting ${DEVICE} with offset ${OFFSET}"
+
${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
fi
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index 09ddd43..b15f093 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
@@ -59,18 +59,32 @@ fi
# Download sources
Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
-echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
-echo -e "live-helper\n${LH_INITRAMFS}" >> chroot/root/dpkg-selection.txt
-echo -e "dosfstools\n${LH_GENISOIMAGE}\nparted\nsquashfs-tools\ngenext2fs" >> chroot/root/dpkg-selection.txt
-
-case "${LIVE_ARCHITECTURE}" in
+cat >> chroot/root/dpkg-selection.txt << EOF
+${LH_BOOTLOADER}
+live-helper
+${LH_INITRAMFS}
+dosfstools
+${LH_GENISOIMAGE}
+parted
+squashfs-tools
+genext2fs
+EOF
+
+case "${LH_ARCHITECTURE}" in
amd64|i386)
- echo -e "${LIVE_MEMTEST}\nmtools\nsyslinux\ngrub" >> chroot/root/dpkg-selection.txt
+
+cat >> chroot/root/dpkg-selection.txt << EOF
+${LH_MEMTEST}
+mtools
+syslinux
+grub
+EOF
+
;;
powerpc)
- echo -e "yaboot" >> chroot/root/dpkg-selection.txt
+ echo "yaboot" >> chroot/root/dpkg-selection.txt
;;
esac
diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live
index 970e0fd..00ddd23 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index e765f3b..78242d8 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE_IMAGES}" != "iso" ]
+if [ "${LH_SOURCE_IMAGES}" != "iso" ]
then
exit 0
fi
@@ -53,10 +53,10 @@ Create_lockfile .lock
mkdir -p source/.disk
-ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
-DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
-DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
-eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+ARCHITECTURE="`echo ${LH_ARCHITECTURE} | sed -e 's# #/#g'`"
+DISTRIBUTION="`echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+DISTRIBUTION="${DISTRIBUTION}`echo ${LH_DISTRIBUTION} | cut -b 2-`"
+eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
case "${LH_MODE}" in
debian)
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index 79e588e..da1e98e 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -32,12 +32,12 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
+if ! echo "${LH_SOURCE_IMAGES}" | grep -qs iso
then
exit 0
fi
@@ -73,24 +73,24 @@ then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
fi
-if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
fi
-if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
fi
-if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
fi
-if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
fi
# Moving image
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 81caef4..55e0d23 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index 58da2f9..c6ef057 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -32,12 +32,12 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
+if ! echo "${LH_SOURCE_IMAGES}" | grep -qs net
then
exit 0
fi
diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar
index 51170a3..5a4d018 100755
--- a/helpers/lh_source_tar
+++ b/helpers/lh_source_tar
@@ -32,12 +32,12 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs tar
+if ! echo "${LH_SOURCE_IMAGES}" | grep -qs tar
then
exit 0
fi
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 3487b63..cf93786 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -32,12 +32,12 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-if [ "${LIVE_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "enabled" ]
then
exit 0
fi
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
+if ! echo "${LH_SOURCE_IMAGES}" | grep -qs usb-hdd
then
exit 0
fi
diff --git a/helpers/make-live b/helpers/make-live
index b0fa676..bf640a8 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -22,389 +22,7 @@
set -e
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+echo "make-live is deprecated."
+echo "Use lh_config and lh_build instead."
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting 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] [--binary-indices 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] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavours FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--iso-preparer STRING] [--iso-publisher STRING] [--iso-application STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
-
-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:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,bootstrap-flavour:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,linux-flavours:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,linux-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,net-server:,net-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,source-images:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
- if [ "${?}" -ne "0" ]
- then
- echo "Terminating." >&2
- exit 1
- fi
-
- if [ "${1}" = "config" ]
- then
- CONFIG="true"
- fi
-
- eval set -- "${ARGUMENTS}"
-
- while true
- do
- case "${1}" in
- # common
- --mode)
- LH_MODE="${2}"; shift 2
- ;;
-
- --config)
- LH_CONFIG="${2}"; shift 2
- ;;
-
- --apt)
- LH_APT="${2}"; shift 2
- ;;
-
- --apt-ftpproxy)
- LH_APT_FTPPROXY="${2}"; shift 2
- ;;
-
- --apt-httpproxy)
- LH_APT_HTTPPROXY="${2}"; shift 2
- ;;
-
- --binary-indices)
- LIVE_BINARY_INDICES="${2}"; shift 2
- ;;
-
- --apt-pdiffs)
- LH_APT_PDIFFS="${2}"; shift 2
- ;;
-
- --apt-recommends)
- LH_APT_RECOMMENDS="${2}"; shift 2
- ;;
-
- --apt-secure)
- LH_APT_SECURE="${2}"; shift 2
- ;;
-
- --bootstrap)
- LH_BOOTSTRAP="${2}"; shift 2
- ;;
-
- --cache)
- LH_CACHE="${2}"; shift 2
- ;;
-
- --debconf-frontend)
- LH_DEBCONF_FRONTEND="${2}"; shift 2
- ;;
-
- --debconf-priority)
- LH_DEBCONF_PRIORITY="${2}"; shift 2
- ;;
-
- --debconf-nowarnings)
- LH_DEBCONF_NOWARNINGS="${2}"; shift 2
- ;;
-
- --genisoimage)
- LH_GENISOIMAGE="${2}"; shift 2
- ;;
-
- --losetup)
- LH_LOSETUP="${2}"; shift 2
- ;;
-
- --tasksel)
- LH_TASKSEL="${2}"; shift 2
- ;;
-
- -r|--root)
- LIVE_ROOT="${2}"; shift 2
- ;;
-
- --root-command)
- LIVE_ROOT_COMMAND="${2}"; shift 2
- ;;
-
- # bootstrap
- -a|--architecture)
- LIVE_ARCHITECTURE="${2}"; shift 2
- ;;
-
- -d|--distribution)
- LIVE_DISTRIBUTION="${2}"; shift 2
- export LIVE_DISTRIBUTION
- ;;
-
- --distribution-config)
- LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
- ;;
-
- -f|--bootstrap-flavour)
- LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
- ;;
-
- -m|--mirror-bootstrap)
- LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
- ;;
-
- --mirror-bootstrap-security)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
- ;;
-
- --mirror-binary)
- LIVE_MIRROR_BINARY="${2}"; shift 2
- ;;
-
- --mirror-binary-security)
- LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
- ;;
-
- --sections)
- LIVE_SECTIONS="${2}"; shift 2
- ;;
-
- # chroot
- --interactive)
- LIVE_INTERACTIVE="${2}"; shift 2
- ;;
-
- --initramfs)
- LH_INITRAMFS="${2}"; shift 2
- ;;
-
- -k|--linux-flavours)
- LIVE_LINUX_FLAVOURS="${2}"; shift 2
- ;;
-
- --linux-packages)
- LIVE_LINUX_PACKAGES="${2}"; shift 2
- ;;
-
- --keyring-packages)
- LIVE_KEYRING_PACKAGES="${2}"; shift 2
- ;;
-
- --hooks)
- LIVE_HOOKS="${2}"; shift 2
- ;;
-
- -l|--language)
- LIVE_LANGUAGE="${2}"; shift 2
- ;;
-
- --packages)
- LIVE_PACKAGES="${2}"; shift 2
- ;;
-
- -p|--packages-lists)
- LIVE_PACKAGES_LISTS="${2}"; shift 2
- ;;
-
- --tasks)
- LIVE_TASKS="${2}"; shift 2
- ;;
-
- --security)
- LIVE_SECURITY="${2}"; shift 2
- ;;
-
- --symlinks)
- LIVE_SYMLINKS="${2}"; shift 2
- ;;
-
- --sysvinit)
- LIVE_SYSVINIT="${2}"; shift 2
- ;;
-
- # image
- --bootappend)
- LIVE_BOOTAPPEND="${2}"; shift 2
- ;;
-
- -e|--encryption)
- LIVE_ENCRYPTION="${2}"; shift 2
- ;;
-
- --username)
- LIVE_USERNAME="${2}"; shift 2
- ;;
-
- --hostname)
- LIVE_HOSTNAME="${2}"; shift 2
- ;;
-
- --chroot-filesystem)
- LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
- ;;
-
- --memtest)
- LIVE_MEMTEST="${2}"; shift 2
- ;;
-
- --iso-application)
- LIVE_ISO_APPLICATION="${2}"; shift 2
- ;;
-
- --iso-preparer)
- LIVE_ISO_PREPARER="${2}"; shift 2
- ;;
-
- --iso-publisher)
- LIVE_ISO_PUBLISHER="${2}"; shift 2
- ;;
-
- --iso-volume)
- LIVE_ISO_VOLUME="${2}"; shift 2
- ;;
-
- --net-server)
- LIVE_NET_SERVER="${2}"; shift 2
- ;;
-
- --net-path)
- LIVE_NET_PATH="${2}"; shift 2
- ;;
-
- --source)
- LIVE_SOURCE="${2}"; shift 2
- ;;
-
- --bootloader)
- LIVE_BOOTLOADER="${2}"; shift 2
- ;;
-
- --grub-splash)
- LIVE_GRUB_SPLASH="${2}"; shift 2
- ;;
-
- --syslinux-splash)
- LIVE_SYSLINUX_SPLASH="${2}"; shift 2
- ;;
-
- -b|--binary-images)
- LIVE_BINARY_IMAGES="${2}"; shift 2
- ;;
-
- -s|--source-images)
- LIVE_SOURCE_IMAGES="${2}"; shift 2
- ;;
-
- --includes)
- LIVE_INCLUDES="${2}"; shift 2
- ;;
-
- --templates)
- LIVE_TEMPLATES="${2}"; shift 2
- ;;
-
- # other
- -h|--help)
- Help; shift
- ;;
-
- -u|--usage)
- Usage; shift
- ;;
-
- -v|--version)
- Version; shift
- ;;
-
- --breakpoints)
- LH_BREAKPOINTS="enabled"; shift
- ;;
-
- --debug)
- LH_DEBUG="enabled"; shift
- ;;
-
- --force)
- LH_FORCE="enabled"; shift
- ;;
-
- --quiet)
- LH_QUIET="enabled"; shift
- ;;
-
- --verbose)
- LH_VERBOSE="enabled"; shift
- ;;
-
- --)
- shift; break
- ;;
-
- *)
- echo "Internal error."
- exit 1
- ;;
- esac
- done
-}
-
-Main ()
-{
- Local_arguments "${@}"
-
- Set_defaults
-
- ROOT="${ROOT:-$LIVE_ROOT}"
-
- # Source existing configuration
- Read_conffile "${ROOT}"/config/common
- Read_conffile "${ROOT}"/config/bootstrap
- Read_conffile "${ROOT}"/config/chroot
- Read_conffile "${ROOT}"/config/binary
- Read_conffile "${ROOT}"/config/source
-
- 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}" LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}" 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}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" 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_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" 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_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
-
- if [ "${LH_BREAKPOINTS}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --breakpoints"
- fi
-
- if [ "${LH_DEBUG}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --debug"
- fi
-
- if [ "${LH_FORCE}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --force"
- fi
-
- if [ "${LH_QUIET}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --quiet"
- fi
-
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --verbose"
- fi
-
- # Building
- if [ -z "${CONFIG}" ]
- then
- cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
- fi
-}
-
-trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
- if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
- 0 1 2 3 9 15
-
-Main "${@}"
+exit 1
diff --git a/lists/devel-live b/lists/devel-live
index cc69664..e29184f 100644
--- a/lists/devel-live
+++ b/lists/devel-live
@@ -3,15 +3,20 @@
## LH: Development (Debian Live)
#<include> standard
+# live-helper
cdebootstrap debootstrap
-
live-helper subversion
+dosfstools genisoimage mkisofs memtest86+ memtest86 mtools parted genext2fs syslinux grub
+# kernel
aufs-source kqemu-source squashfs-source unionfs-source
-aufs-tools qemu unionfs-tools
+aufs-tools qemu squashfs-tools unionfs-tools
#linux-headers-2.6-all
-vim less screen gnupg
+# netboot
+dhcp3-server nfs-kernel-server tftp-hpa
+# some other stuff
+vim less screen gnupg
build-essential debhelper dh-make lintian fakeroot devscripts wdiff
autotools-dev dpatch module-assistant
diff --git a/lists/knoppix b/lists/knoppix
new file mode 100644
index 0000000..f7d1dd5
--- /dev/null
+++ b/lists/knoppix
@@ -0,0 +1,1352 @@
+# /usr/share/live-helper/lists/knoppix - package list for live-helper(7)
+
+## LH: KNOPPIX (CD)
+#<include> standard
+
+# packagelist inspired from Knoppix 5.1.1.
+
+# FIXME: remove knoppix own packages, strip out libs
+
+0wn
+aalib-bin
+aalib1
+ace-of-penguins
+acpi
+adduser
+adtool
+aespipe
+afio
+airsnort
+alevt
+alien
+alsa-base
+alsa-utils
+amanda-client
+amanda-common
+amanda-server
+anacron
+apache2
+apache2-mpm-prefork
+apache2-utils
+apache2.2-common
+apmd
+apt
+apt-file
+apt-method-installed
+apt-show-versions
+apt-utils
+arj
+ark
+arpwatch
+artwiz-cursor
+ash-knoppix-26
+at
+atitvout
+atmel-firmware
+attr
+audacity
+aufs-cvs-modules-2.6.19
+aufs-cvs-utils
+aumix-gtk
+autoconf
+autofs
+automount-knoppix
+autotools-dev
+autotrace
+avm-firmware
+base-files
+base-passwd
+bash
+bb
+bc
+beryl
+beryl-core
+beryl-manager
+beryl-plugins
+beryl-plugins-data
+beryl-settings
+biew
+bin86
+bind9
+bind9-host
+binfmt-support
+bing
+binutils
+binutils-dev
+bittorrent
+blt
+bluetooth
+bluez-firmware
+bluez-utils
+bochsbios
+bonnie++
+bridge-utils
+brltty
+bsdiff
+bsdmainutils
+bsdutils
+btpin-knoppix
+buffer
+build-essential
+busybox
+bzip2
+ca-certificates
+cabextract
+capiutils
+cdbackup
+cdbs
+cdda2wav
+cddb
+cdparanoia
+cdrdao
+cdrecord
+checkmem
+chkrootkit
+clamav
+clamav-base
+clamav-freshclam
+cloop-module-2.6.19
+cloop-utils
+configure-xawtv
+console-common
+console-data
+console-tools
+convertfs
+coreutils
+cowsay
+cpio
+cpp
+cpp-4.1
+cpuburn
+cramfsprogs
+cron
+cryptcat
+cryptsetup
+cups-pdf
+cupsconfig-knoppix
+cupsys
+cupsys-bsd
+cupsys-client
+cupsys-common
+cupsys-driver-gutenprint
+cvs
+dante-client
+dash
+dbus
+dc
+dcraw
+dctrl-tools
+dd-rescue
+ddcxinfo-knoppix
+dds2tar
+debconf
+debconf-i18n
+debconf-utils
+debfoster
+debhelper
+debian-archive-keyring
+debianutils
+debootstrap
+deborphan
+debsums
+defoma
+devscripts
+dh-make
+dhcp3-common
+dhcp3-server
+dialog
+dict
+dictionaries-common
+dietlibc-dev
+diff
+diffstat
+ding
+distcc
+dmidecode
+dmraid
+dmsetup
+dnsutils
+doc-base
+docbook-xml
+dosfstools
+dpkg
+dpkg-dev
+dpkg-repack
+drdsl
+dselect
+dsniff
+dump
+dupload
+dvb-mpegtools
+dvb-utils
+dvbackup
+dvbsnoop
+dvbstream
+dvbtune
+dvd+rw-tools
+dvdauthor
+dvdbackup
+dvgrab
+e00compr
+e2fslibs
+e2fsprogs
+ed
+efax
+eject
+elinks
+emerald
+enscript
+escputil
+esound-common
+etcskel-knoppix
+etherwake
+ethtool
+ettercap-common
+ettercap-gtk
+euro-support
+euro-support-console
+expect
+ext2resize
+fakeroot
+fb-music-low
+fbi
+fbset
+fdflush
+fdisk-udeb
+fdutils
+fetchmail
+ffmpeg
+file
+fileutils
+findutils
+finger
+firefox
+firewall-knoppix
+fluxbox
+fontconfig
+fontconfig-config
+foomatic-bin
+foomatic-db
+foomatic-db-engine
+foomatic-db-gutenprint
+foomatic-db-hpijs
+foomatic-filters
+foremost
+fortune-mod
+fortunes-debian-hints
+fortunes-min
+fping
+freeglut3
+freemind
+freenx
+frozen-bubble
+frozen-bubble-data
+ftp
+ftpd
+fttools
+fuse-utils
+g++
+g++-4.1
+gaim
+gaim-data
+gaim-encryption
+gawk
+gcc
+gcc-3.3-base
+gcc-4.1
+gcc-4.1-base
+gconf2
+gconf2-common
+gdb
+genisoimage
+genliloconf
+gettext
+gettext-base
+gif2png
+giflib-bin
+giflib3g
+giftrans
+gimp
+gimp-data
+gimp-print
+gksu
+gnome-keyring
+gnuchess
+gnupg
+gnupg2
+gocr
+gpart
+gparted
+gpgsm
+gpgv
+gphoto2
+gpm
+gprsconnect-knoppix
+gpsdrive
+gpstrans
+gq
+gqcam
+grep
+groff
+groff-base
+grub
+grub-disk
+gs-common
+gs-esp
+gscanbus
+gsfonts
+gsfonts-x11
+gsm-utils
+gtans
+gtk-smooth-themes
+gtk2-engines
+gtk2-engines-smooth
+gtkam
+gv
+gzip
+hal
+hdparm
+hexedit
+hfsplus
+hfsutils
+hicolor-icon-theme
+hostap-utils
+hostapd
+hostname
+hpijs
+hping2
+html2text
+httptunnel
+hunt
+hwdata-knoppix
+hwsetup
+hwtools
+i810switch
+ibod
+icedax
+icedove
+icedove-locale-de
+iceweasel
+iceweasel-l10n-de
+icewm
+icewm-common
+icmpush
+idswakeup
+iftop
+ifupdown
+ijsgutenprint
+imagemagick
+imaze
+imlib-base
+imlib11
+info
+infobash
+ingerman
+initramfs-tools
+initrd-tools
+initscripts
+intltool-debian
+ipcalc
+ipchains
+iperf
+ipppd
+iproute
+ipsec-tools
+iptables
+iptraf
+iputils-ping
+iputils-tracepath
+ipv6calc
+ipw2100-nonfree
+ipw2200-nonfree
+ipx
+irda-common
+irda-tools
+irssi
+irssi-plugin-icq
+irssi-scripts
+isapnptools
+isdnactivecards
+isdntool-knoppix
+isdnutils-base
+isdnvboxclient
+isomaster
+ispell
+java-common
+java2-runtime-knoppix
+jfsutils
+joe
+k3b
+k3b-defaults
+k3b-i18n
+kaffeine
+kalarm
+kamera
+kandy
+kappfinder
+kate
+katomic
+kbackup
+kbackup-multibuf
+kbattleship
+kbdconfig
+kcalc
+kcharselect
+kcontrol
+kde-i18n-de
+kde-i18n-es
+kde-i18n-fr
+kde-i18n-it
+kde-i18n-ja
+kde-i18n-nl
+kde-i18n-pl
+kde-i18n-tr
+kde-menu-knoppix
+kde-services-knoppix
+kdeaddons-kfile-plugins
+kdeadmin-kfile-plugins
+kdebase
+kdebase-bin
+kdebase-data
+kdebase-kio-plugins
+kdebluetooth
+kdegraphics-kfile-plugin
+kdelibs-data
+kdelibs4c2a
+kdelock-knoppix
+kdemultimedia-kfile-plug
+kdemultimedia-kio-plugin
+kdenetwork-kfile-plugins
+kdepasswd
+kdepim-kfile-plugins
+kdepim-kio-plugins
+kdeprint
+kdeservicemenus-knoppix
+kdesktop
+kdessh
+kdf
+kdm
+kexec-tools
+keyboard-tr-knoppix
+kfax
+kfind
+kfloppy
+kget
+kghostview
+khelpcenter
+khexedit
+kicker
+kiconedit
+kismet
+klaptopdaemon
+klibc-utils
+klipper
+klogd
+kmahjongg
+kmail
+kmailcvt
+kmenuedit
+kmix
+knode
+knoppix-bookmarks
+knoppix-certificates
+knoppix-dma
+knoppix-graphics
+knoppix-image
+knoppix-initscripts
+knoppix-installer
+knoppix-menu
+knoppix-ndiswrapper
+knoppix-remountrw
+knoppix-setrootpassword
+knoppix-sounds
+knoppix-splash-utils
+knoppix-swm
+knoppix-terminalserver
+knoppix-udev-config
+knoppix-workarounds
+knotes
+konq-plugins
+konqueror
+konqueror-nsplugins
+konsole
+konsolekalendar
+kooka
+kpackage
+kpager
+kpdf
+kpersonalizer
+kpf
+kphone
+kppp
+krdc
+kreversi
+krfb
+ksmserver
+ksnapshot
+ksokoban
+ksplash
+ksudoku
+ksync
+ksysguard
+ksysguardd
+ksysv
+kteatime
+ktimer
+ktip
+ktnef
+ktuberling
+kudzu-knoppix-vesa
+kuickshow
+kuser
+kview
+kviewshell
+kwin
+kwlan
+laptop-detect
+ldap-utils
+lde
+less
+lesstif2
+lftp
+lha
+liba52-0.7.4
+libaa1
+libacl1
+libadns1
+libao2
+libapache2-mod-php4
+libapm1
+libapr1
+libaprutil1
+libapt-pkg-perl
+libart-2.0-2
+libarts1c2a
+libartsc0
+libasound2
+libaspell15
+libatk1.0-0
+libatm1
+libattr1
+libaudio2
+libaudiofile0
+libautotrace3
+libavahi-client3
+libavahi-common-data
+libavahi-common3
+libavahi-compat-howl0
+libavahi-compat-libdnssd
+libavahi-qt3-1
+libavc1394-0
+libavcodec0d
+libavformat0d
+libbeecrypt6
+libberylsettings0
+libbind9-0
+libblkid1
+libbluetooth2
+libbz2-1.0
+libc6
+libc6-dev
+libcaca0
+libcairo2
+libcap1
+libcapi20-3
+libcapi20-dev
+libcdio6
+libcdk5
+libcdparanoia0
+libclamav1
+libcomerr2
+libconfhelper-perl
+libconfig-file-perl
+libconsole
+libcroco3
+libcucul0
+libcupsimage2
+libcupsys2
+libcurl3
+libcurl3-gnutls
+libdate-manip-perl
+libdb1-compat
+libdb4.2
+libdb4.3
+libdb4.4
+libdbd-mysql-perl
+libdbi-perl
+libdbus-1-3
+libdbus-glib-1-2
+libdbus-qt-1-1c2
+libdc1394-13
+libdevmapper1.02
+libdirectfb-0.9-25
+libdm0
+libdns21
+libdrm2
+libdv-bin
+libdv4
+libdvdread3
+libedit2
+libelfg0
+libemeraldengine0
+libenchant1c2a
+libesd-alsa0
+libevent1
+libexif-gtk5
+libexif12
+libexpat1
+libfam0
+libflac++5
+libflac7
+libfontconfig1
+libfontenc1
+libfreetype6
+libfribidi0
+libfs6
+libft-perl
+libfuse2
+libgcc1
+libgconf2-4
+libgcrypt11
+libgd2-xpm
+libgdbm3
+libgdchart-gd2-noxpm
+libgeoip1
+libgimp2.0
+libgksu2-0
+libgl1-mesa-dri
+libgl1-mesa-glx
+libglade2-0
+libglib1.2
+libglib2.0-0
+libglib2.0-data
+libglibmm-2.4-1c2a
+libglu1-mesa
+libgmp3c2
+libgnome-keyring0
+libgnutls13
+libgpg-error0
+libgpgme11
+libgphoto2-2
+libgphoto2-port0
+libgpmg1
+libgsf-1-114
+libgsf-1-common
+libgsm1
+libgsmme1c2a
+libgssapi2
+libgstreamer0.10-0
+libgtk1.2
+libgtk1.2-common
+libgtk2.0-0
+libgtk2.0-bin
+libgtk2.0-common
+libgtkmm-2.4-1c2a
+libgtkspell0
+libgtop2-7
+libgtop2-common
+libgutenprint2
+libgutenprintui2-1
+libhal-storage1
+libhal1
+libhfsp0
+libhtml-parser-perl
+libhtml-tagset-perl
+libhtml-tree-perl
+libice6
+libid3tag0
+libident
+libidl0
+libidn11
+libieee1284-3
+libijs-0.35
+libisc11
+libisccc0
+libisccfg1
+libiso9660-4
+libiw28
+libjack0.100.0-0
+libjasper-1.701-1
+libjcode-pm-perl
+libjpeg-progs
+libjpeg62
+libjpeg62-dev
+libk3b2
+libkcal2b
+libkcddb1
+libkdegames1
+libkdepim1a
+libkleopatra1
+libklibc
+libkmime2
+libkonq4
+libkpimidentities1
+libkrb53
+libksba8
+libkscan1
+libksieve0
+libktnef1
+liblcms1
+libldap-2.3-0
+libldap2
+liblircclient0
+liblocale-gettext-perl
+liblockdev1
+liblockfile1
+liblogfile-rotate-perl
+libltdl3
+liblua50
+liblualib50
+liblwres9
+liblzo1
+libmad0
+libmagic1
+libmagick++9c2a
+libmagick9
+libmikmod2
+libmimelib1c2a
+libmng1
+libmodplug0c2
+libmpcdec3
+libmusicbrainz4c2a
+libmyspell3c2
+libmysqlclient15off
+libnasl2
+libncp
+libncurses5
+libncurses5-dev
+libncursesw5
+libneon25
+libnessus2
+libnet-daemon-perl
+libnet0
+libnet1
+libnetpbm10
+libnewt-utf8-0
+libnewt0.52
+libnfsidmap2
+libnids1.20
+libnspr4
+libnspr4-0d
+libnss3-0d
+libntfs9
+libntfs9-knoppix
+libogg0
+liboggflac3
+libopencdk8
+libopenexr2c2a
+libopenobex1
+liborbit2
+libpam-modules
+libpam-ncp
+libpam-runtime
+libpam0g
+libpango1.0-0
+libpango1.0-common
+libpaper-utils
+libpaper1
+libparted1.6-0
+libparted1.7-1
+libpcap0.7
+libpcap0.8
+libpcd2
+libpci2
+libpcre3
+libperl5.8
+libpisock9
+libplot2c2
+libplrpc-perl
+libpng12-0
+libpoppler0c2
+libpoppler0c2-qt
+libpopt0
+libportaudio0
+libpostproc0d
+libpq4
+libpstoedit0c2a
+libpth20
+libqt3-mt
+libquicktime0
+libraw1394-8
+libreadline4
+libreadline5
+librecode0
+librpcsecgss3
+librpm4
+librsvg2-2
+libsamplerate0
+libsane
+libsane-extras
+libsasl2
+libsasl2-2
+libsasl2-modules
+libscrollkeeper0
+libsdl-console
+libsdl-gfx1.2-4
+libsdl-image1.2
+libsdl-mixer1.2
+libsdl-net1.2
+libsdl-pango1
+libsdl-perl
+libsdl-ttf2.0-0
+libsdl1.2debian
+libsdl1.2debian-alsa
+libselinux1
+libsensors3
+libsepol1
+libsexy2
+libsigc++-2.0-0c2a
+libslang2
+libslp1
+libsm6
+libsmbclient
+libsmpeg0
+libsndfile1
+libsnmp-base
+libsnmp9
+libspeex1
+libsqlite3-0
+libss2
+libssl0.9.7
+libssl0.9.8
+libssp0
+libstartup-notification0
+libstdc++2.10-glibc2.2
+libstdc++5
+libstdc++6
+libstdc++6-4.1-dev
+libsvga1
+libsysfs2
+libt1-5
+libtag1c2a
+libtasn1-3
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtheora0
+libtiff-tools
+libtiff4
+libttf2
+libungif4g
+libuniconf4.2
+liburi-perl
+libusb-0.1-4
+libuuid1
+libvcdinfo0
+libvolume-id0
+libvorbis0a
+libvorbisenc2
+libvorbisfile3
+libvte-common
+libvte4
+libweakref-perl
+libwmf0.2-7
+libwnck-common
+libwnck18
+libwrap0
+libwvstreams4.2-base
+libwvstreams4.2-extras
+libwww-perl
+libwxgtk2.4-1
+libx11-6
+libx11-data
+libxau6
+libxaw7
+libxcomp1
+libxcompext1
+libxcomposite1
+libxcursor1
+libxdamage1
+libxdelta2
+libxdmcp6
+libxext6
+libxfixes3
+libxfont1
+libxft2
+libxi6
+libxine1
+libxinerama1
+libxkbfile1
+libxml2
+libxmu6
+libxmuu1
+libxp6
+libxplc0.3.13
+libxpm4
+libxrandr2
+libxrender1
+libxres1
+libxslt1.1
+libxss1
+libxt6
+libxtrap6
+libxtst6
+libxv1
+libxvmc1
+libxxf86dga1
+libxxf86misc1
+libxxf86vm1
+libzvbi-common
+libzvbi0
+libzzip-0-12
+lilo
+linux-image-2.6.19
+linux-kernel-headers
+linux-sound-base
+lisa
+loadlin
+locales
+lockfile-progs
+login
+logrotate
+loop-aes-modules-2.6.19
+loop-aes-utils
+lrzsz
+lsb-base
+lsof
+ltrace
+lvm-common
+lvm2
+lynx
+lzop
+m4
+macutils
+madwifi-modules-2.6.19
+madwifi-tools
+mailx
+make
+makedev
+man-db
+manpages
+manpages-de
+manpages-dev
+mawk
+mbr
+mc
+mdadm
+memtester
+menu
+menu-xdg
+mesa-utils
+mikmod
+mime-support
+minicom
+mkbootdev
+mkdesktophdicons-knoppix
+mkdosswapfile-knoppix
+mkisofs
+mknbi
+mktemp
+mobilemesh
+modconf
+modemlink-knoppix
+modemtool-knoppix
+module-init-tools
+modutils
+mount
+mount-ntfs-knoppix
+mouseconfig
+mpack
+mpg321
+mplayer
+mplayer-skin-blue
+ms-sys
+mt-st
+mtools
+mtr-tiny
+mutt
+myspell-en-us
+mysql-client
+mysql-client-5.0
+mysql-common
+nano
+nasm
+ncpfs
+ncurses-base
+ncurses-bin
+ndiswrapper-modules-2.6.
+ndiswrapper-utils
+nedit
+nessus
+nessus-plugins
+nessusd
+net-tools
+netbase
+netcardconfig-knoppix
+netcat
+netcat6
+netpbm
+netpipe-tcp
+network-setup-knoppix
+networkconfig-knoppix
+networkstatus
+nfs-common
+nfs-kernel-server
+ngrep
+nmap
+ntfs-3g
+ntfsprogs-knoppix
+ntpdate
+nvtv
+nxagent
+nxclient
+nxdesktop
+nxlibs
+nxproxy
+nxsetup-knoppix
+nxssh
+nxtunnel-client
+nxtunnel-server
+odbcinst1debian1
+openbsd-inetd
+openhackware
+openoffice-de-en
+openoffice.org-debian-me
+openssh-client
+openssh-server
+openssl
+openvpn
+outguess
+p0f
+parted-bf
+partimage
+partimage-server
+passwd
+patch
+pciutils
+pciutils-dev
+pcmcia-cs
+pcmciautils
+perl
+perl-base
+perl-modules
+perl-suid
+pgpgpg
+php4-common
+php4-mysql
+pia
+pkg-config
+playmidi
+playvideodisk-knoppix
+pmount
+pnm2ppa
+po-debconf
+portmap
+poster
+powermgmt-base
+ppmd
+ppp
+ppp-scripts-knoppix
+pppconfig
+pppdcapiplugin
+pppoe
+pppoeconf
+pppstatus
+pptp-linux
+print-utils-pfeifle
+prism54-nonfree
+procinfo
+procmail
+procps
+proll
+psfontmgr
+psmisc
+psutils
+pump
+python
+python-central
+python-imaging
+python-imaging-tk
+python-minimal
+python-support
+python-tk
+python2.4
+python2.4-minimal
+qemu
+qobex
+qps
+qtparted
+radio
+rcs
+rdate
+rdesktop
+readline-common
+rebuildfstab-knoppix
+recode
+recover
+reiserfsprogs
+reportbug
+restartx-knoppix
+rootshell-knoppix
+rpm
+rsync
+rt2x00-cvs-modules-2.6.1
+rxvt-beta
+s3switch
+samba
+samba-common
+sambastart-knoppix
+sane
+sane-utils
+sash
+saveconfig-knoppix
+scanmodem
+scanpartitions-knoppix
+scantv
+scli
+screen
+scribus
+scrollkeeper
+sed
+sendfile
+sendip
+setserial
+sgml-base
+sgml-data
+shaper
+sharutils
+sitar
+slang1
+slang1a-utf8
+sleuthkit
+smail
+smartmontools
+smbclient
+smbconf-pfeifle
+smbconf-pfeifle-nonfree
+smbfs
+sndconfig-knoppix
+sniffit
+sound-recorder
+soundcardconfig-knoppix
+sox
+speedtouch
+speex
+squid
+squid-common
+squidclient
+ssh
+sshstart-knoppix
+ssl-cert
+sslwrap
+star
+startnessus-knoppix
+startsyslog-knoppix
+statserial
+strace
+stress
+stunnel
+sudo
+sudoers-knoppix
+sun-java5-bin
+sun-java5-demo
+sun-java5-jdk
+sun-java5-jre
+sun-java5-plugin
+sweep
+symlinks
+synaptic
+sysklogd
+syslinux
+sysv-rc
+sysvinit
+sysvinit-utils
+tar
+tcl8.4
+tcpd
+tcpdump
+telnet-ssl
+telnetd-ssl
+testdisk
+tftp
+tftpd-hpa
+thttpd
+thunderbird
+thunderbird-locale-de
+tiger
+tightvncserver
+tk8.4
+tnef
+tofrodos
+tpconfig
+traceroute
+trans-de-en
+transfig
+tshark
+tsocks
+ttf-bitstream-vera
+ttf-f500
+ttf-freefont
+ttf-isabella
+ttf-openoffice
+ttf-opensymbol
+ttf-staypuft
+ttf-summersby
+ttmkfdir
+twm
+txt2regex
+type-handling
+type1inst
+tzdata
+ucf
+udev
+udpcast
+uml-utilities
+umlrun-uml
+unifont
+units
+unixodbc
+unp
+unzip
+unzoo
+update
+update-inetd
+urlview
+usbutils
+usbview
+user-de
+user-profile-knoppix
+usleep-knoppix
+util-linux
+util-linux-locales
+uudeview
+v4l-conf
+vcdimager
+vcdtools
+vgabios
+vim
+vim-common
+vim-gtk
+vim-gui-common
+vim-runtime
+vim-scripts
+vimpart
+vlan
+vnc-common
+vorbis-tools
+vpnc
+vrms
+wakeonlan
+wavemon
+wavtools
+wget
+whiptail
+whois
+wine
+winetools
+wipe
+wireless-tools
+wireshark
+wireshark-common
+wlcardconfig-knoppix
+wodim
+wpasupplicant
+wprint
+wvdial
+x-ttcidfont-conf
+x11-common
+xaos
+xaw3dg
+xawtv
+xawtv-plugins
+xbase-clients
+xbattle
+xbitmaps
+xboard
+xchat
+xchat-common
+xdelta
+xdialog
+xdm
+xfonts-100dpi
+xfonts-100dpi-transcoded
+xfonts-75dpi
+xfonts-75dpi-transcoded
+xfonts-base
+xfonts-bolkhov-cp1251-75
+xfonts-bolkhov-cp1251-mi
+xfonts-dosemu
+xfonts-encodings
+xfonts-scalable
+xfonts-terminus
+xfonts-utils
+xfsdump
+xfsprogs
+xgalaga
+xkb-data
+xkbset
+xlibmesa-gl
+xlibs
+xloadimage
+xml-core
+xmms
+xmms-cdread
+xmms-goom
+xmms-modplug
+xmms-volnorm
+xnest
+xorg
+xorgconfig-knoppix
+xosview
+xpdf
+xpdf-common
+xpdf-reader
+xpdf-utils
+xsane
+xsane-common
+xserver-xorg
+xserver-xorg-core
+xserver-xorg-input-evdev
+xserver-xorg-input-kbd
+xserver-xorg-input-mouse
+xserver-xorg-input-synap
+xserver-xorg-video-all
+xserver-xorg-video-apm
+xserver-xorg-video-ark
+xserver-xorg-video-ati
+xserver-xorg-video-chips
+xserver-xorg-video-cirru
+xserver-xorg-video-cyrix
+xserver-xorg-video-dummy
+xserver-xorg-video-fbdev
+xserver-xorg-video-glint
+xserver-xorg-video-i128
+xserver-xorg-video-i740
+xserver-xorg-video-i810
+xserver-xorg-video-imstt
+xserver-xorg-video-mga
+xserver-xorg-video-neoma
+xserver-xorg-video-newpo
+xserver-xorg-video-nsc
+xserver-xorg-video-nv
+xserver-xorg-video-rendi
+xserver-xorg-video-s3
+xserver-xorg-video-s3vir
+xserver-xorg-video-savag
+xserver-xorg-video-silic
+xserver-xorg-video-sis
+xserver-xorg-video-sisus
+xserver-xorg-video-tdfx
+xserver-xorg-video-tga
+xserver-xorg-video-tride
+xserver-xorg-video-tseng
+xserver-xorg-video-v4l
+xserver-xorg-video-vesa
+xserver-xorg-video-vga
+xserver-xorg-video-via
+xserver-xorg-video-vmwar
+xserver-xorg-video-voodo
+xsession-initscript-knop
+xsession-knoppix
+xskat
+xterm
+xtightvncviewer
+xtv
+xutils
+xutils-dev
+xviddetect
+xzoom
+zile
+zip
+zlib1g
+zlib1g-dev
diff --git a/lists/knoppix-dvd b/lists/knoppix-dvd
new file mode 100644
index 0000000..b24fad7
--- /dev/null
+++ b/lists/knoppix-dvd
@@ -0,0 +1,3481 @@
+# /usr/share/live-helper/lists/knoppix-dvd - package list for live-helper(7)
+
+## LH: KNOPPIX (DVD)
+#<include> standard
+
+# packagelist inspired from Knoppix 5.1.1.
+
+# FIXME: remove knoppix own packages, strip out libs
+
+0wn
+3270-common
+a2ps
+aalib-bin
+aalib1
+abiword-common
+abiword-gnome
+abiword-help
+ace-of-penguins
+acpi
+adduser
+adtool
+aespipe
+afio
+airsnort
+akregator
+alevt
+alien
+alsa-base
+alsa-utils
+amanda-client
+amanda-common
+amanda-server
+amarok
+amarok-engines
+amarok-xine
+amor
+anacron
+ant
+ant-optional
+antlr
+apache
+apache-common
+apache-dev
+apache-doc
+apache-utils
+apache2
+apache2-doc
+apache2-mpm-prefork
+apache2-utils
+apache2.2-common
+apcalc
+apcalc-common
+apel
+apmd
+apt
+apt-doc
+apt-file
+apt-listchanges
+apt-method-installed
+apt-show-versions
+apt-utils
+aptitude
+aribas
+arj
+ark
+arpwatch
+arts
+artsbuilder
+artwiz-cursor
+asclock
+asclock-themes
+ash-knoppix-26
+aspell
+aspell-de
+aspell-doc
+aspell-en
+aspell-es
+aspell-fr
+aspell-it
+aspell-pl
+at
+at-spi
+atitvout
+atlantik
+atlantikdesigner
+atlas2-base
+atlas3-base
+atlas3-base-dev
+atlas3-headers
+atmel-firmware
+attr
+auctex
+audacious
+audacious-plugins
+audacious-plugins-extra
+audacity
+aufs-cvs-modules-2.6.19
+aufs-cvs-utils
+aumix-gtk
+autoclass
+autoconf
+autofs
+automake1.4
+automake1.7
+automake1.9
+automount-knoppix
+autotools-dev
+autotrace
+avce00
+avm-firmware
+axiom
+axiom-databases
+axkit
+axkit-examples
+axkit-language-htmldoc
+axkit-language-query
+axyftp-doc
+axyftp-gtk
+bacula
+bacula-client
+bacula-common
+bacula-console
+bacula-director-common
+bacula-director-mysql
+bacula-doc
+bacula-fd
+bacula-sd
+bacula-sd-sqlite3
+bacula-server
+base-files
+base-passwd
+bash
+basket
+bb
+bc
+beneath-a-steel-sky
+beryl
+beryl-core
+beryl-manager
+beryl-plugins
+beryl-plugins-data
+beryl-settings
+biew
+bin86
+bind9
+bind9-host
+binfmt-support
+bing
+binutils
+binutils-dev
+bison
+bitmap-mule
+bittorrent
+blas
+blender
+blinken
+blt
+bluefish
+bluez-firmware
+bluez-utils
+bochs
+bochs-doc
+bochs-sdl
+bochs-term
+bochs-wx
+bochs-x
+bochsbios
+bonnie++
+bridge-utils
+brltty
+bsdiff
+bsdmainutils
+bsdutils
+btpin-knoppix
+buffer
+bug-buddy
+build-essential
+busybox
+bximage
+bzflag
+bzflag-server
+bzip2
+ca-certificates
+cabextract
+capisuite
+capiutils
+capplets-data
+cdbackup
+cdbs
+cdd-common
+cdda2wav
+cddb
+cdparanoia
+cdrdao
+cdrecord
+cdrtools-doc
+cdrw-taper
+cernlib-base
+cervisia
+cfortran
+cgoban
+checkmem
+chipcard-tools
+chkrootkit
+chktex
+chromium
+chromium-data
+cjk-latex
+cl-asdf
+cl-cil
+cl-reversi
+cl-utilities
+clamav
+clamav-base
+clamav-docs
+clamav-freshclam
+clara
+cli-common
+cli-common-dev
+cloop-module-2.6.19
+cloop-utils
+cmt
+colorgcc
+comerr-dev
+common-lisp-controller
+compiz
+compiz-core
+compiz-gnome
+compiz-gtk
+compiz-plugins
+configure-xawtv
+console-common
+console-data
+console-tools
+convertfs
+coreutils
+cowsay
+cpio
+cpp
+cpp-3.3
+cpp-3.4
+cpp-4.0
+cpp-4.0-doc
+cpp-4.1
+cpp-4.1-doc
+cpp-doc
+cpuburn
+crack-attack
+cramfsprogs
+cron
+crossfire-client
+crossfire-client-gtk
+crossfire-client-gtk2
+crossfire-client-images
+crossfire-client-sounds
+crossfire-client-x11
+crossfire-common
+crossfire-doc
+crossfire-edit
+crossfire-maps
+crossfire-server
+cryptcat
+cryptsetup
+crystalspace
+crystalspace-dev
+crystalspace-doc
+csh
+csound
+csound-doc
+cups-pdf
+cupsconfig-knoppix
+cupsys
+cupsys-bsd
+cupsys-client
+cupsys-common
+cupsys-driver-gutenprint
+cvs
+cycle
+d4x
+d4x-common
+dante-client
+dash
+dasher
+dasher-data
+db4.2-util
+db4.3-util
+dbconfig-common
+dbishell
+dbus
+dc
+dcraw
+dctrl-tools
+dd-rescue
+ddcxinfo-knoppix
+ddd
+dds2tar
+debconf
+debconf-i18n
+debconf-utils
+debfoster
+debhelper
+debian-archive-keyring
+debian-keyring
+debiandoc-sgml
+debianutils
+debootstrap
+deborphan
+debsums
+defoma
+defrag
+desktop-base
+desktop-file-utils
+devscripts
+dh-make
+dhcp3-common
+dhcp3-server
+dia
+dia-common
+dia-gnome
+dia-libs
+dialog
+dict
+dictionaries-common
+dietlibc-dev
+diff
+diffstat
+digikam
+digikamimageplugins
+dillo
+ding
+dirmngr
+discover1
+discover1-data
+distcc
+dlint
+dlocate
+dmidecode
+dmraid
+dmsetup
+dnsutils
+doc-base
+doc-linux-html
+docbook
+docbook-dsssl
+docbook-xml
+docbook-xsl
+dosfstools
+dpatch
+dpkg
+dpkg-dev
+dpkg-repack
+drdsl
+dselect
+dsh
+dsniff
+dump
+dupload
+dvb-mpegtools
+dvb-utils
+dvbackup
+dvbsnoop
+dvbstream
+dvbtune
+dvd+rw-tools
+dvdauthor
+dvdbackup
+dvdrecord
+dvgrab
+dvipng
+e00compr
+e2fslibs
+e2fslibs-dev
+e2fsprogs
+ec-fonts-mftraced
+ecj-bootstrap
+eclipse
+eclipse-jdt
+eclipse-pde
+eclipse-platform
+eclipse-rcp
+eclipse-source
+ed
+edict
+efax
+efax-gtk
+effectv
+efibootmgr
+eject
+ekiga
+elinks
+emacs-intl-fonts
+emacs21
+emacs21-bin-common
+emacs21-common
+emacsen-common
+emerald
+emerald-themes
+enigma
+enigma-data
+enlightenment
+enlightenment-data
+enscript
+eog
+epiphany-browser
+erlang
+erlang-base
+erlang-dev
+erlang-examples
+erlang-mode
+erlang-nox
+erlang-src
+erlang-x11
+escputil
+esound
+esound-common
+ess
+etcskel-knoppix
+eterm
+etherwake
+ethtool
+ettercap-common
+ettercap-gtk
+euler
+euro-support
+euro-support-console
+euro-support-x
+evilwm
+evince
+evolution
+evolution-common
+evolution-data-server
+evolution-data-server-co
+evolution-exchange
+evolver
+expect
+ext2resize
+eyesapplet
+f2c
+fakeroot
+falconseye
+falconseye-data
+fast-user-switch-applet
+fastjar
+fb-music-low
+fbi
+fbset
+fdflush
+fdisk-udeb
+fdutils
+fenris
+festival
+festlex-cmu
+festlex-poslex
+festvox-kallpc16k
+festvox-kdlpc16k
+fetchmail
+ffmpeg
+fftw-dev
+fftw2
+fftw3
+fftw3-dev
+fifteenapplet
+file
+file-roller
+fileutils
+findutils
+finger
+firefox
+firefox-dom-inspector
+firewall-knoppix
+flex
+flobopuyo
+fluxbox
+fnlib-data
+fontconfig
+fontconfig-config
+fontforge
+fontforge-doc
+fonty
+foomatic-bin
+foomatic-db
+foomatic-db-engine
+foomatic-db-gimp-print
+foomatic-db-gutenprint
+foomatic-db-hpijs
+foomatic-filters
+foremost
+fortune-mod
+fortunes-debian-hints
+fortunes-min
+fp-compiler
+fp-docs
+fp-ide
+fp-units-base
+fp-units-db
+fp-units-fcl
+fp-units-fv
+fp-units-gfx
+fp-units-gnome1
+fp-units-gtk
+fp-units-gtk2
+fp-units-misc
+fp-units-net
+fp-units-rtl
+fp-utils
+fpc-crosswin32
+fpc-src
+fping
+freeciv-client-gtk
+freeciv-data
+freeciv-server
+freefem
+freefem-doc
+freefem-examples
+freefem3d
+freeglut3
+freemind
+freenx
+freepats
+freepops
+freeradius
+frozen-bubble
+frozen-bubble-data
+ftape-util
+ftp
+ftpd
+fttools
+fuse-utils
+g++
+g++-3.3
+g++-4.0
+g++-4.1
+g-wrap
+g77
+g77-3.3
+g77-3.3-doc
+g77-3.4
+gaim
+gaim-data
+gaim-encryption
+gambas-gb-qt
+gambas-runtime
+gambit
+gambit-doc
+gamin
+gap
+gap-character-tables
+gap-core
+gap-dev
+gap-doc
+gap-libs
+gap-online-help
+gap-prim-groups
+gap-small-groups
+gap-small-groups-extra
+gap-table-of-marks
+gap-trans-groups
+gawk
+gbib
+gcalctool
+gcc
+gcc-3.3
+gcc-3.3-base
+gcc-3.4
+gcc-3.4-base
+gcc-4.0
+gcc-4.0-base
+gcc-4.0-doc
+gcc-4.1
+gcc-4.1-base
+gcc-4.1-doc
+gcc-doc
+gcc-doc-base
+gcj
+gcj-3.3
+gcj-4.0-base
+gcj-4.1
+gcj-4.1-base
+gcom
+gcompris
+gcompris-data
+gcompris-sound-da
+gcompris-sound-de
+gcompris-sound-en
+gcompris-sound-es
+gcompris-sound-fr
+gcompris-sound-it
+gcompris-sound-pt
+gcompris-sound-ru
+gconf
+gconf-editor
+gconf2
+gconf2-common
+gdal-bin
+gdb
+gdk-imlib1
+gdk-imlib11
+gdm
+gdm-themes
+geant321-doc
+geas
+geas-doc
+geda
+geda-doc
+geda-examples
+geda-gattrib
+geda-gnetlist
+geda-gschem
+geda-gsymcheck
+geda-symbols
+geda-utils
+gedit
+gedit-common
+geg
+genisoimage
+genliloconf
+geomview
+gerbv
+gettext
+gettext-base
+gettext-el
+gfortran
+gfortran-4.1
+gftp
+gftp-common
+gftp-gtk
+gftp-text
+ghemical
+gif2png
+giflib-bin
+giflib3g
+giftrans
+gij
+gij-4.0
+gij-4.1
+gimp
+gimp-data
+gimp-print
+ginac-tools
+git-core
+gjdoc
+gkrellm
+gkrellmd
+gksu
+glibc-doc
+glpk
+gmessage
+gmsh
+gmt
+gmt-coast-low
+gmt-doc
+gmt-examples
+gmt-tutorial
+gmt-tutorial-pdf
+gnokii
+gnome
+gnome-about
+gnome-accessibility-them
+gnome-applets
+gnome-applets-data
+gnome-backgrounds
+gnome-bin
+gnome-cards-data
+gnome-control-center
+gnome-core
+gnome-cups-manager
+gnome-desktop-data
+gnome-desktop-environmen
+gnome-doc-tools
+gnome-doc-utils
+gnome-games
+gnome-games-data
+gnome-games-extra-data
+gnome-gv
+gnome-icon-theme
+gnome-keyring
+gnome-keyring-manager
+gnome-libs-data
+gnome-mag
+gnome-media
+gnome-media-common
+gnome-menus
+gnome-mime-data
+gnome-netstatus-applet
+gnome-nettool
+gnome-office
+gnome-panel
+gnome-panel-data
+gnome-session
+gnome-system-monitor
+gnome-system-tools
+gnome-terminal
+gnome-terminal-data
+gnome-themes
+gnome-themes-extras
+gnome-user-guide
+gnome-utils
+gnome-volume-manager
+gnome2-user-guide
+gnopernicus
+gnubg
+gnubg-data
+gnucash
+gnucash-common
+gnucash-docs
+gnuchess
+gnuchess-book
+gnue-appserver
+gnue-common
+gnue-designer
+gnue-forms
+gnue-navigator
+gnue-reports
+gnugo
+gnuhtml2latex
+gnumeric
+gnumeric-common
+gnumeric-doc
+gnumeric-plugins-extra
+gnupg
+gnupg-agent
+gnupg2
+gnuplot
+gnuplot-doc
+gnuplot-nox
+gnuplot-x11
+gnustep-base-common
+gnustep-common
+gnustep-make
+gnutls-bin
+gocr
+gok
+gok-doc
+gpart
+gparted
+gpc
+gpc-2.1-3.4
+gpc-2.1-3.4-doc
+gpdf
+gperiodic
+gpgsm
+gpgv
+gphoto2
+gpm
+gpp
+gprolog
+gprolog-doc
+gprsconnect-knoppix
+gpsdrive
+gpstrans
+gq
+gqcam
+gqview
+grace
+gramofile
+graphviz
+graphviz-doc
+grass
+grass-doc
+grep
+grep-dctrl
+gri
+gri-el
+gri-html-doc
+grip
+groff
+groff-base
+grub
+grub-disk
+gs-common
+gs-esp
+gs-gpl
+gscanbus
+gsfonts
+gsfonts-x11
+gsl-bin
+gsl-doc-pdf
+gsl-ref-html
+gsl-ref-psdoc
+gsm-utils
+gstreamer0.10-alsa
+gstreamer0.10-gnomevfs
+gstreamer0.10-gnonlin
+gstreamer0.10-plugins-ba
+gstreamer0.10-plugins-go
+gstreamer0.10-plugins-ug
+gstreamer0.8-plugin-apps
+gstreamer0.8-tools
+gtans
+gthumb
+gtk-engines-qtpixmap
+gtk-smooth-themes
+gtk2-engines
+gtk2-engines-pixbuf
+gtk2-engines-spherecryst
+gtk2-engines-xfce
+gtkam
+gtkglarea5
+gtkhtml3.2
+gtkhtml3.6
+gtkhtml3.8
+gucharmap
+guile-1.6
+guile-1.6-dev
+guile-1.6-libs
+guile-1.6-slib
+guile-g-wrap
+guile-library
+gutenprint-doc
+gutenprint-locales
+gv
+gwenview
+gzip
+hal
+hal-device-manager
+hdparm
+helix-player
+hermes1
+hevea
+hexedit
+hfsplus
+hfsutils
+hicolor-icon-theme
+hostap-utils
+hostapd
+hostname
+hotplug-utils
+hpijs
+hping2
+hspell
+htdig
+html2text
+htmldoc
+htmldoc-common
+httptunnel
+hunt
+hwdata-knoppix
+hwinfo
+hwsetup
+hwtools
+i810switch
+iamerican
+iasl
+ibod
+ibritish
+iceape-browser
+icedax
+icedove
+icedove-inspector
+icedove-locale-bg
+icedove-locale-cs
+icedove-locale-da
+icedove-locale-de
+icedove-locale-el
+icedove-locale-es-es
+icedove-locale-fi
+icedove-locale-fr
+icedove-locale-gu
+icedove-locale-he
+icedove-locale-hu
+icedove-locale-it
+icedove-locale-ja
+icedove-locale-ko
+icedove-locale-mk
+icedove-locale-nb
+icedove-locale-nl
+icedove-locale-ru
+icedove-locale-sk
+icedove-locale-sl
+icedove-locale-sv
+icedove-locale-tr
+icedove-locale-zh-cn
+icedove-typeaheadfind
+iceweasel
+iceweasel-dom-inspector
+iceweasel-l10n-ar
+iceweasel-l10n-bg
+iceweasel-l10n-ca
+iceweasel-l10n-cs
+iceweasel-l10n-da
+iceweasel-l10n-de
+iceweasel-l10n-el
+iceweasel-l10n-es-es
+iceweasel-l10n-eu
+iceweasel-l10n-fi
+iceweasel-l10n-fr
+iceweasel-l10n-hu
+iceweasel-l10n-it
+iceweasel-l10n-ja
+iceweasel-l10n-lt
+iceweasel-l10n-nl
+iceweasel-l10n-pl
+iceweasel-l10n-pt-br
+iceweasel-l10n-ru
+iceweasel-l10n-sk
+iceweasel-l10n-sl
+iceweasel-l10n-zh-cn
+icewm
+icewm-common
+icewm-themes
+icmpush
+iconx
+idswakeup
+iftop
+ifupdown
+ijsgimpprint
+ijsgutenprint
+ilisp
+imageindex
+imagemagick
+imaze
+imlib-base
+imlib-progs
+imlib11
+indi
+industrial-cursor-theme
+info
+infobash
+initramfs-tools
+initrd-tools
+initscripts
+inkscape
+intltool-debian
+ipcalc
+ipchains
+iperf
+ipppd
+iproute
+ipsec-tools
+iptables
+iptraf
+iputils-ping
+iputils-tracepath
+ipv6calc
+ipw2100-nonfree
+ipw2200-nonfree
+ipx
+ipython
+irb
+irb1.8
+ircii
+irda-common
+irda-tools
+irssi
+irssi-plugin-icq
+irssi-scripts
+isapnptools
+isdnactivecards
+isdntool-knoppix
+isdnutils-base
+isdnvboxclient
+iso-codes
+isomaster
+ispell
+jackd
+jade
+java-common
+java2-runtime-knoppix
+jfsutils
+jikes
+joe
+john
+jokosher
+jpilot
+jpilot-backup
+jpilot-mail
+jpilot-plugins
+jpilot-syncmal
+juk
+junit
+k3b
+k3b-defaults
+k3b-i18n
+kaddressbook
+kaffe
+kaffe-common
+kaffe-pthreads
+kaffeine
+kakasi
+kakasi-dic
+kalarm
+kalzium
+kalzium-data
+kamera
+kanagram
+kandy
+kanjidic
+kappfinder
+kapptemplate
+karbon
+karm
+kasteroids
+kate
+kate-plugins
+katomic
+kbabel
+kbabel-dev
+kbackgammon
+kbackup
+kbackup-doc
+kbackup-multibuf
+kbattleship
+kbdconfig
+kbear
+kblackbox
+kbounce
+kbruch
+kbugbuster
+kcachegrind
+kcalc
+kcharselect
+kchart
+kcoloredit
+kcontrol
+kcron
+kdat
+kde-amusements
+kde-core
+kde-i18n-az
+kde-i18n-bg
+kde-i18n-ca
+kde-i18n-cs
+kde-i18n-da
+kde-i18n-de
+kde-i18n-el
+kde-i18n-es
+kde-i18n-et
+kde-i18n-fa
+kde-i18n-fi
+kde-i18n-fr
+kde-i18n-he
+kde-i18n-hu
+kde-i18n-it
+kde-i18n-ja
+kde-i18n-nl
+kde-i18n-pl
+kde-i18n-pt
+kde-i18n-ptbr
+kde-i18n-ru
+kde-i18n-sk
+kde-i18n-sl
+kde-i18n-sr
+kde-i18n-sv
+kde-i18n-tr
+kde-i18n-zhcn
+kde-i18n-zhtw
+kde-menu-knoppix
+kde-services-knoppix
+kdeaddons-kfile-plugins
+kdeadmin
+kdeadmin-kfile-plugins
+kdeartwork
+kdeartwork-emoticons
+kdeartwork-misc
+kdeartwork-style
+kdeartwork-theme-icon
+kdeartwork-theme-window
+kdebase
+kdebase-bin
+kdebase-data
+kdebase-kio-plugins
+kdebluetooth
+kdeedu
+kdeedu-data
+kdeedu-doc-html
+kdegames
+kdegames-card-data
+kdegames-doc-html
+kdegraphics-doc-html
+kdegraphics-kfile-plugin
+kdelibs
+kdelibs-data
+kdelibs4-dev
+kdelibs4c2a
+kdelock-knoppix
+kdemultimedia-kfile-plug
+kdemultimedia-kio-plugin
+kdenetwork-kfile-plugins
+kdepasswd
+kdepim
+kdepim-kfile-plugins
+kdepim-kio-plugins
+kdepim-kresources
+kdepim-wizards
+kdeprint
+kdesdk
+kdesdk-doc-html
+kdesdk-kfile-plugins
+kdesdk-kio-plugins
+kdesdk-misc
+kdesdk-scripts
+kdeservicemenus-knoppix
+kdesktop
+kdessh
+kdetoys
+kdetoys-doc-html
+kdevelop
+kdevelop-data
+kdevelop-doc
+kdewallpapers
+kdewebdev
+kdewebdev-doc-html
+kdf
+kdict
+kdiff3
+kdissert
+kdm
+kdoc
+kdvi
+keduca
+kenolaba
+kernel-package
+kexec-tools
+kexi
+keyboard-tr-knoppix
+kfax
+kfilereplace
+kfind
+kfloppy
+kformula
+kfouleggs
+kgamma
+kget
+kghostview
+kgoldrunner
+khangman
+khelpcenter
+khexedit
+kicker
+kiconedit
+kig
+kile
+kile-i18n
+kimagemapeditor
+kino
+kiosktool
+kipi-plugins
+kismet
+kitchensync
+kiten
+kivio
+kivio-data
+kjumpingcube
+klaptopdaemon
+klatin
+kleopatra
+klettres
+klettres-data
+klibc-utils
+klickety
+klines
+klinkstatus
+klipper
+klogd
+kmahjongg
+kmail
+kmailcvt
+kmenuedit
+kmessedwords
+kmines
+kmix
+kmoon
+kmplot
+kmrml
+kmtrace
+kmymoney2
+knetwalk
+knetworkconf
+knode
+knoppix-bookmarks
+knoppix-certificates
+knoppix-customize
+knoppix-dma
+knoppix-graphics
+knoppix-image
+knoppix-initscripts
+knoppix-installer
+knoppix-menu
+knoppix-ndiswrapper
+knoppix-remountrw
+knoppix-setrootpassword
+knoppix-sounds
+knoppix-splash
+knoppix-splash-utils
+knoppix-swm
+knoppix-terminalserver
+knoppix-udev-config
+knoppix-workarounds
+knotes
+kodo
+koffice
+koffice-data
+koffice-dev
+koffice-doc
+koffice-doc-html
+koffice-i18n-af
+koffice-i18n-bg
+koffice-i18n-br
+koffice-i18n-ca
+koffice-i18n-cs
+koffice-i18n-da
+koffice-i18n-de
+koffice-i18n-el
+koffice-i18n-es
+koffice-i18n-et
+koffice-i18n-fa
+koffice-i18n-fi
+koffice-i18n-fr
+koffice-i18n-he
+koffice-i18n-hu
+koffice-i18n-it
+koffice-i18n-ja
+koffice-i18n-nl
+koffice-i18n-pl
+koffice-i18n-pt
+koffice-i18n-ptbr
+koffice-i18n-ru
+koffice-i18n-se
+koffice-i18n-sk
+koffice-i18n-sl
+koffice-i18n-sr
+koffice-i18n-sv
+koffice-i18n-tr
+koffice-i18n-zhcn
+koffice-i18n-zhtw
+koffice-libs
+kolf
+kolourpaint
+kommander
+kommander-dev
+kompare
+konq-plugins
+konqueror
+konqueror-nsplugins
+konquest
+konsole
+konsolekalendar
+kontact
+konversation
+kooka
+kopete
+korganizer
+korn
+koshell
+kpackage
+kpager
+kpat
+kpdf
+kpercentage
+kpersonalizer
+kpf
+kphone
+kpilot
+kplato
+kpoker
+kppp
+kpresenter
+kpresenter-data
+kqemu-gui
+krdc
+kreversi
+krfb
+krita
+krita-data
+kruler
+krusader
+ksame
+kscreensaver
+kscreensaver-xsavers
+kshisen
+ksim
+ksirtet
+ksmiletris
+ksmserver
+ksnake
+ksnapshot
+ksokoban
+kspaceduel
+ksplash
+kspread
+kspy
+kstars
+kstars-data
+ksudoku
+ksvg
+ksync
+ksysguard
+ksysguardd
+ksysv
+kteatime
+kthesaurus
+ktimer
+ktip
+ktnef
+ktouch
+ktron
+ktuberling
+kturtle
+ktux
+kudzu-knoppix-dev
+kudzu-knoppix-vesa
+kugar
+kuickshow
+kuiviewer
+kunittest
+kuser
+kvdr
+kverbos
+kview
+kviewshell
+kvoctrain
+kweather
+kwifimanager
+kwin
+kwin4
+kwlan
+kword
+kword-data
+kwordquiz
+kworldclock
+kxsldbg
+lacheck
+ladcca2
+ladspa-sdk
+lam-runtime
+lam4c2
+lapack
+lapack3
+laptop-detect
+larswm
+latex-beamer
+latex-cjk-common
+latex-xcolor
+latex-xft-fonts
+latex2html
+lazarus
+ldap-utils
+lde
+less
+lesstif-dev
+lesstif1
+lesstif2
+lftp
+lha
+liba52-0.7.4
+libaa1
+libaa1-dev
+libacl1
+libacl1-dev
+libadns1
+libaiksaurus-1.2-0c2a
+libaiksaurus-1.2-data
+libakode2
+libalgorithm-dependency-
+libalut0
+libanthy0
+libao2
+libapache-dbi-perl
+libapache-mod-perl
+libapache-mod-ssl
+libapache-request-perl
+libapache-session-perl
+libapache2-mod-jk
+libapache2-mod-php5
+libapm1
+libappconfig-perl
+libapr0
+libapr1
+libaprutil1
+libapt-pkg-perl
+libaqbanking-data
+libaqbanking-plugins-lib
+libaqbanking16
+libaqdtaus3
+libaqgeldkarte4
+libaqhbci10
+libarchive-zip-perl
+libart-2.0-2
+libart-2.0-dev
+libart2
+libarts1-dev
+libarts1c2a
+libartsc0
+libartsc0-dev
+libasound2
+libasound2-dev
+libaspell-dev
+libaspell15
+libast2
+libasyncns0
+libatk1.0-0
+libatk1.0-dev
+libatm1
+libatspi1.0-0
+libattr1
+libattr1-dev
+libaudacious4
+libaudio-dev
+libaudio2
+libaudiofile-dev
+libaudiofile0
+libauthen-sasl-perl
+libautotrace3
+libavahi-client-dev
+libavahi-client3
+libavahi-common-data
+libavahi-common-dev
+libavahi-common3
+libavahi-compat-howl0
+libavahi-compat-libdnssd
+libavahi-glib1
+libavahi-qt3-1
+libavahi-qt3-dev
+libavc1394-0
+libavc1394-dev
+libavcodec0d
+libavformat0d
+libbcel-java
+libbeecrypt6
+libberylsettings0
+libbind9-0
+libblkid1
+libbluetooth2
+libbonobo2-0
+libbonobo2-common
+libbonoboui2-0
+libbonoboui2-common
+libboost-date-time1.33.1
+libboost-filesystem1.33.
+libboost-python1.32.0
+libboost-python1.33.0c2a
+libboost-python1.33.1
+libboost-regex1.33.1
+libbraille
+libbrlapi1
+libbz2-1.0
+libbz2-dev
+libc-client2002edebian
+libc6
+libc6-dev
+libcaca0
+libcache-cache-perl
+libcache-simple-timedexp
+libcairo-perl
+libcairo2
+libcairo2-dev
+libcamel1.2-8
+libcanlock2
+libcap-dev
+libcap1
+libcapi20-3
+libcapi20-dev
+libcapsinetwork0c2a
+libcdio6
+libcdk5
+libcdparanoia0
+libcfitsio2
+libchipcard-common
+libchipcard2-0c2
+libchipcard20
+libclamav1
+libclan2c2a-gui
+libclan2c2a-jpeg
+libclan2c2a-mikmod
+libclan2c2a-png
+libclan2c2a-sound
+libclan2c2a-vorbis
+libclanlib2c2a
+libclass-accessor-perl
+libclass-autouse-perl
+libclass-container-perl
+libclass-data-inheritabl
+libclass-inspector-perl
+libclass-returnvalue-per
+libcln4
+libclone-perl
+libcomerr2
+libcommons-beanutils-jav
+libcommons-collections-j
+libcommons-collections3-
+libcommons-dbcp-java
+libcommons-digester-java
+libcommons-el-java
+libcommons-fileupload-ja
+libcommons-launcher-java
+libcommons-logging-java
+libcommons-modeler-java
+libcommons-pool-java
+libcommons-validator-jav
+libcompfaceg1
+libcompress-zlib-perl
+libconfhelper-perl
+libconfig-file-perl
+libconfig-tiny-perl
+libconsole
+libconvert-asn1-perl
+libconvert-binhex-perl
+libcroco3
+libcrypt-ssleay-perl
+libcsiro0
+libcucul0
+libcupsimage2
+libcupsys2
+libcupsys2-dev
+libcurl3
+libcurl3-gnutls
+libcvsservice0
+libdate-manip-perl
+libdb1-compat
+libdb3
+libdb4.2
+libdb4.3
+libdb4.4
+libdb4.4-dev
+libdbd-mysql-perl
+libdbd-pg-perl
+libdbi-perl
+libdbix-dbschema-perl
+libdbix-searchbuilder-pe
+libdbus-1-2
+libdbus-1-3
+libdbus-1-dev
+libdbus-glib-1-2
+libdbus-qt-1-1c2
+libdc1394-13
+libdevel-stacktrace-perl
+libdevel-symdump-perl
+libdevmapper1.02
+libdigest-sha1-perl
+libdirectfb-0.9-25
+libdirectfb-dev
+libdirectfb-extra
+libdiscover1
+libdjvulibre15
+libdm0
+libdmx-dev
+libdmx1
+libdns21
+libdrm2
+libdshconfig1
+libdv-bin
+libdv4
+libdv4-dev
+libdvdread-dev
+libdvdread3
+libebook1.2-5
+libecal1.2-6
+libedata-book1.2-2
+libedata-cal1.2-5
+libedataserver1.2-7
+libedataserverui1.2-6
+libedit2
+libeel2-2
+libeel2-data
+libegroupwise1.2-10
+libelfg0
+libemeraldengine0
+libenchant1c2a
+liberror-perl
+libesd-alsa0
+libesd0-dev
+libestools1.2
+libevent1
+libexception-class-perl
+libexchange-storage1.2-1
+libexif-dev
+libexif-gtk5
+libexif12
+libexiv2-0.10
+libexo-0.3-0
+libexpat1
+libexpat1-dev
+libextutils-autoinstall-
+libf2c2
+libf2c2-dev
+libfcgi-perl
+libffi4
+libffi4-dev
+libfile-find-rule-perl
+libfile-flat-perl
+libfile-ncopy-perl
+libfile-remove-perl
+libfile-slurp-perl
+libfinance-quote-perl
+libflac++5
+libflac7
+libfltk1.1
+libfluidsynth1
+libfont-afm-perl
+libfontconfig1
+libfontconfig1-dev
+libfontenc-dev
+libfontenc1
+libforms1
+libfreefem0
+libfreetype6
+libfreetype6-dev
+libfreezethaw-perl
+libfribidi0
+libfs-dev
+libfs6
+libft-perl
+libfuse-dev
+libfuse2
+libg2c0
+libg2c0-dev
+libgadu3
+libgail-common
+libgail-gnome-module
+libgail17
+libgal2.2-1
+libgal2.2-common
+libgal2.4-0
+libgal2.4-common
+libgamin-dev
+libgamin0
+libgc1c2
+libgcc1
+libgcj-bc
+libgcj-common
+libgcj4
+libgcj4-awt
+libgcj4-common
+libgcj6
+libgcj6-jar
+libgcj7-0
+libgcj7-awt
+libgcj7-dev
+libgcj7-jar
+libgcompris-1-0
+libgconf11
+libgconf2-4
+libgconf2.0-cil
+libgcrypt11
+libgcrypt11-dev
+libgd2-xpm
+libgda2-3
+libgda2-common
+libgdal1-1.3.2
+libgdbm3
+libgdchart-gd2-noxpm
+libgdgeda6
+libgdiplus
+libgdk-pixbuf-dev
+libgdk-pixbuf2
+libgecko2.0-cil
+libgeda20
+libgeo-ipfree-perl
+libgeoip1
+libgeos2c2a
+libgfortran1
+libgfortran1-dev
+libghemical-data
+libghemical0c2a
+libghttp1
+libgimp2.0
+libginac1.3c2a
+libgksu1.2-0
+libgksu2-0
+libgksuui1.0-1
+libgl1-mesa-dev
+libgl1-mesa-dri
+libgl1-mesa-glx
+libglade2-0
+libglade2.0-cil
+libgle3
+libglib-perl
+libglib1.2
+libglib1.2-dev
+libglib2.0-0
+libglib2.0-cil
+libglib2.0-data
+libglib2.0-dev
+libglibmm-2.4-1c2a
+libglibmm-2.4-dev
+libglide3
+libglpk0
+libglpng
+libglu1-mesa
+libglu1-mesa-dev
+libglu1-xorg
+libglu1-xorg-dev
+libgmp3c2
+libgnokii3
+libgnome-desktop-2
+libgnome-keyring0
+libgnome-mag2
+libgnome-media0
+libgnome-menu2
+libgnome-pilot2
+libgnome-speech3
+libgnome-window-settings
+libgnome2-0
+libgnome2-canvas-perl
+libgnome2-common
+libgnome2-perl
+libgnome2-vfs-perl
+libgnome2.0-cil
+libgnome32
+libgnomecanvas2-0
+libgnomecanvas2-common
+libgnomecups1.0-1
+libgnomecupsui1.0-1c2a
+libgnomeprint2.2-0
+libgnomeprint2.2-data
+libgnomeprintui2.2-0
+libgnomeprintui2.2-commo
+libgnomesupport0
+libgnomeui-0
+libgnomeui-common
+libgnomeui32
+libgnomevfs2-0
+libgnomevfs2-bin
+libgnomevfs2-common
+libgnomevfs2-extra
+libgnorba27
+libgnorbagtk0
+libgnutls-dev
+libgnutls12
+libgnutls13
+libgoffice-1-2
+libgoffice-1-common
+libgpg-error-dev
+libgpg-error0
+libgpgme11
+libgphoto2-2
+libgphoto2-2-dev
+libgphoto2-port0
+libgpmg1
+libgpod0
+libgraflib1
+libgraflib1-dev
+libgrafx11-1
+libgrafx11-1-dev
+libgraphicsmagick1
+libgsf-1-114
+libgsf-1-common
+libgsf-gnome-1-114
+libgsl0
+libgsl0-dev
+libgsm1
+libgsmme1c2a
+libgssapi2
+libgstreamer-plugins-bas
+libgstreamer0.10-0
+libgstreamer0.8-0
+libgtk1.2
+libgtk1.2-common
+libgtk1.2-dev
+libgtk2-perl
+libgtk2.0-0
+libgtk2.0-bin
+libgtk2.0-cil
+libgtk2.0-common
+libgtk2.0-dev
+libgtkglext1
+libgtkhtml3.2-11
+libgtkhtml3.6-18
+libgtkhtml3.8-15
+libgtkmm-2.4-1c2a
+libgtkmm-2.4-dev
+libgtksourceview-common
+libgtksourceview1.0-0
+libgtksourceview2.0-cil
+libgtkspell0
+libgtop2-7
+libgtop2-common
+libgts-0.7-1
+libgucharmap4
+libguile-ltdl-1
+libgutenprint2
+libgutenprintui2-1
+libgwenhywfar-data
+libgwenhywfar38
+libgwrap-runtime0
+libgwrap-runtime0-dev
+libhal-storage1
+libhal1
+libhd13
+libhdf4g
+libhdf5-serial-1.6.5-0
+libhdf5-serial-dev
+libhfsp0
+libhtml-format-perl
+libhtml-mason-perl
+libhtml-parser-perl
+libhtml-scrubber-perl
+libhtml-tableextract-per
+libhtml-tagset-perl
+libhtml-template-expr-pe
+libhtml-template-perl
+libhtml-tree-perl
+libhttp-ghttp-perl
+libice-dev
+libice6
+libicu36
+libid3-3.8.3c2a
+libid3tag0
+libident
+libidl0
+libidn11
+libidn11-dev
+libiec61883-0
+libieee1284-3
+libifp4
+libijs-0.35
+libimage-base-bundle-per
+libimage-info-perl
+libimlib2
+libimlib2-dev
+libindex0
+libio-pty-perl
+libio-socket-ssl-perl
+libio-string-perl
+libio-stringy-perl
+libiodbc2
+libipc-run-perl
+libipc-sharelite-perl
+libisc11
+libisccc0
+libisccfg1
+libiso9660-4
+libiw-dev
+libiw28
+libjack0.100.0-0
+libjack0.100.0-dev
+libjasper-1.701-1
+libjasper-1.701-dev
+libjaxp1.3-java
+libjcode-perl
+libjcode-pm-perl
+libjpeg-progs
+libjpeg62
+libjpeg62-dev
+libjsch-java
+libk3b2
+libkadm55
+libkbanking1
+libkcal2b
+libkcddb1
+libkdeedu3
+libkdegames1
+libkdepim1a
+libkernlib1
+libkernlib1-dev
+libkexif1
+libkgantt0
+libkipi0
+libkiten1
+libkjsembed1
+libkleopatra1
+libklibc
+libkmime2
+libkonq4
+libkpathsea4
+libkpimexchange1
+libkpimidentities1
+libkrb5-dev
+libkrb53
+libksba8
+libkscan1
+libksieve0
+libktnef1
+libktoblzcheck1c2a
+liblcms1
+liblcms1-dev
+libldap-2.3-0
+libldap2
+libldap2-dev
+liblinphone1
+liblircclient0
+liblo0
+liblocale-gettext-perl
+liblocale-maketext-fuzzy
+liblocale-maketext-lexic
+liblockdev1
+liblockfile1
+liblog-dispatch-perl
+liblog4j1.2-java
+liblog4net1.2-cil
+liblogfile-rotate-perl
+libloudmouth1-0
+liblrdf0
+libltdl3
+libltdl3-dev
+liblua50
+liblua50-dev
+liblualib50
+liblualib50-dev
+liblucene-java
+liblucene-java-doc
+liblwres1
+liblwres9
+liblzo-dev
+liblzo1
+libm17n-0
+libmad0
+libmad0-dev
+libmagic1
+libmagick++9c2a
+libmagick9
+libmagick9-dev
+libmailtools-perl
+libmal1
+libmath++0c2a
+libmathlib2
+libmathlib2-dev
+libmdc2
+libmeanwhile1
+libmediastreamer0
+libmetacity0
+libmhash2
+libmikmod2
+libmime-perl
+libmimelib1c2a
+libmldbm-perl
+libmms0
+libmng-dev
+libmng1
+libmodplug0c2
+libmodule-versions-repor
+libmono-accessibility2.0
+libmono-cairo1.0-cil
+libmono-cecil0.4-cil
+libmono-corlib1.0-cil
+libmono-corlib2.0-cil
+libmono-data-tds1.0-cil
+libmono-data-tds2.0-cil
+libmono-microsoft-build2
+libmono-peapi1.0-cil
+libmono-peapi2.0-cil
+libmono-relaxng1.0-cil
+libmono-security1.0-cil
+libmono-security2.0-cil
+libmono-sharpzip0.84-cil
+libmono-sharpzip2.84-cil
+libmono-system-data1.0-c
+libmono-system-data2.0-c
+libmono-system-runtime1.
+libmono-system-runtime2.
+libmono-system-web1.0-ci
+libmono-system-web2.0-ci
+libmono-system1.0-cil
+libmono-system2.0-cil
+libmono-winforms2.0-cil
+libmono0
+libmono1.0-cil
+libmono2.0-cil
+libmopac7-0
+libmozjs0d
+libmpcdec3
+libmpeg2-4
+libmpeg2-4-dev
+libmpeg3-1
+libmpeg3-dev
+libmpfr1
+libmpich1.0c2
+libmusicbrainz4c2a
+libmx4j-java
+libmyspell3c2
+libmysqlclient10
+libmysqlclient15-dev
+libmysqlclient15off
+libnasl2
+libnautilus-burn2
+libnautilus-burn3
+libnautilus-extension1
+libncp
+libncurses5
+libncurses5-dev
+libncursesw5
+libncursesw5-dev
+libneon25
+libneon26
+libnessus2
+libnet-daemon-perl
+libnet-ip-perl
+libnet-ldap-perl
+libnet-ssleay-perl
+libnet0
+libnet1
+libnetcdf3
+libnetpbm10
+libnewt-dev
+libnewt-utf8-0
+libnewt0.52
+libnfsidmap2
+libnids1.20
+libniftiio0
+libnjb5
+libnm-glib0
+libnotify1
+libnspr4
+libnspr4-0d
+libnss-mdns
+libnss3
+libnss3-0d
+libntfs-knoppix-dev
+libntfs9
+libntfs9-knoppix
+libnumber-compare-perl
+liboaf0
+libofx3
+libogg-dev
+libogg0
+liboggflac3
+liboil0.3
+libopal-2.2.0
+libopenal0a
+libopenbabel1
+libopencdk8
+libopencdk8-dev
+libopenexr-dev
+libopenexr2c2a
+libopenobex1
+liborbit0
+liborbit2
+liboro-java
+libortp5
+libosip2-3
+libosp5
+libostyle1c2
+libotf0
+libpacklib1
+libpacklib1-dev
+libpam-modules
+libpam-ncp
+libpam-runtime
+libpam0g
+libpam0g-dev
+libpanel-applet2-0
+libpango1.0-0
+libpango1.0-common
+libpango1.0-dev
+libpaper-utils
+libpaper1
+libparams-util-perl
+libparams-validate-perl
+libpari-dev
+libpari2-gmp
+libparse-recdescent-perl
+libparted1.6-0
+libparted1.7-1
+libparted1.7-dev
+libpath-class-perl
+libpawlib2
+libpawlib2-dev
+libpcap0.7
+libpcap0.8
+libpcd2
+libpci2
+libpcre3
+libpcre3-dev
+libpcrecpp0
+libpcsclite1
+libperl5.8
+libpg-perl
+libpgsql2
+libpisock8
+libpisock9
+libpisync0
+libplot2c2
+libplplot9
+libplrpc-perl
+libpng12-0
+libpng12-dev
+libpod-tests-perl
+libpoppler0c2
+libpoppler0c2-glib
+libpoppler0c2-qt
+libpopt-dev
+libpopt0
+libportaudio0
+libpostproc0d
+libpq-dev
+libpq4
+libpqxx-2.6.8
+libprefork-perl
+libpstoedit0c2a
+libpt-1.10.0
+libpt-plugins-oss
+libpt-plugins-v4l2
+libpth20
+libpulse0
+libpvm3
+libqbanking4
+libqcad0
+libqhull5
+libqscintilla6
+libqt3-compat-headers
+libqt3-headers
+libqt3-mt
+libqt3-mt-dev
+libqt3-mt-psql
+libqt4-core
+libqt4-gui
+libqthreads-12
+libquantlib-0.3.13
+libquicktime-dev
+libquicktime0
+libraptor1
+libraw1394-8
+libraw1394-dev
+libreadline-ruby1.8
+libreadline4
+libreadline5
+libreadline5-dev
+librecode0
+libregexp-common-perl
+libregexp-java
+libresid-builder0c2a
+libresmgr1
+libroman-perl
+librpcsecgss3
+librplay3
+librpm4
+librsvg2-2
+librsvg2-common
+libruby1.8
+librxp1
+libsablot0
+libsamplerate0
+libsane
+libsane-extras
+libsasl2
+libsasl2-2
+libsasl2-dev
+libsasl2-modules
+libsc7
+libscrollkeeper0
+libsdl-console
+libsdl-erlang
+libsdl-gfx1.2-4
+libsdl-image1.2
+libsdl-mixer1.2
+libsdl-net1.2
+libsdl-pango1
+libsdl-perl
+libsdl-ttf2.0-0
+libsdl1.2-dev
+libsdl1.2debian
+libsdl1.2debian-alsa
+libselinux1
+libsensors3
+libsepol1
+libservlet2.3-java
+libservlet2.4-java
+libsexy2
+libsgmls-perl
+libsgutils1
+libshout3
+libsidplay1
+libsidplay2
+libsigc++-2.0-0c2a
+libsigc++-2.0-dev
+libslang2
+libslang2-dev
+libslp1
+libsm-dev
+libsm6
+libsmbclient
+libsmpeg0
+libsndfile1
+libsnmp-base
+libsnmp9
+libsoup2.2-8
+libsp1c2
+libspeex1
+libsqlite0
+libsqlite3-0
+libss2
+libssl-dev
+libssl0.9.6
+libssl0.9.7
+libssl0.9.8
+libssp0
+libstartup-notification0
+libstdc++2.10-glibc2.2
+libstdc++5
+libstdc++5-3.3-dev
+libstdc++6
+libstdc++6-4.0-dev
+libstdc++6-4.1-dev
+libstroke0
+libstruts1.2-java
+libsufary2
+libsvga1
+libsvga1-dev
+libsvn1
+libswt3.2-gtk-java
+libswt3.2-gtk-jni
+libsysfs2
+libt1-5
+libtag1c2a
+libtagc0
+libtasn1-3
+libtasn1-3-dev
+libtemplate-perl
+libterm-readkey-perl
+libterm-readline-perl-pe
+libtest-classapi-perl
+libtest-inline-perl
+libtext-autoformat-perl
+libtext-charwidth-perl
+libtext-format-perl
+libtext-glob-perl
+libtext-iconv-perl
+libtext-quoted-perl
+libtext-reform-perl
+libtext-template-perl
+libtext-wikiformat-perl
+libtext-wrapi18n-perl
+libtext-wrapper-perl
+libtheora-dev
+libtheora0
+libthunar-vfs-1-2
+libtidy-0.99-0
+libtiff-tools
+libtiff4
+libtiff4-dev
+libtiffxx0c2
+libtime-modules-perl
+libtimedate-perl
+libtomcat5-java
+libtomcat5.5-java
+libtool
+libtotem-plparser1
+libtree-simple-perl
+libtse3-0.3.1c2a
+libttf2
+libtunepimp-bin
+libtunepimp3
+libufsparse
+libungif4-dev
+libungif4g
+libuniconf4.2
+liburi-perl
+libusb-0.1-4
+libusb-dev
+libuuid1
+libvcdinfo0
+libvisual-0.4-0
+libvolume-id0
+libvorbis-dev
+libvorbis0a
+libvorbisenc2
+libvorbisfile3
+libvte-common
+libvte4
+libvtk5
+libvtk5-dev
+libwant-perl
+libwavpack0
+libweakref-perl
+libwmf-bin
+libwmf-dev
+libwmf0.2-7
+libwnck-common
+libwnck18
+libwpd8c2a
+libwrap0
+libwrap0-dev
+libwraster3
+libwv-1.2-1
+libwv-1.2-3
+libwv2-1c2
+libwvstreams4.2-base
+libwvstreams4.2-extras
+libwww-perl
+libwxbase2.6-0
+libwxgtk2.4-1
+libwxgtk2.6-0
+libx11-6
+libx11-data
+libx11-dev
+libxalan110
+libxau-dev
+libxau6
+libxaw-headers
+libxaw6
+libxaw7
+libxaw7-dev
+libxcomp1
+libxcompext1
+libxcomposite-dev
+libxcomposite1
+libxcursor-dev
+libxcursor1
+libxdamage-dev
+libxdamage1
+libxdelta2
+libxdmcp-dev
+libxdmcp6
+libxerces2-java
+libxerces27
+libxevie-dev
+libxevie1
+libxext-dev
+libxext6
+libxfce4mcs-client3
+libxfce4mcs-manager3
+libxfce4util4
+libxfcegui4-4
+libxfixes-dev
+libxfixes3
+libxfont-dev
+libxfont1
+libxft-dev
+libxft2
+libxi-dev
+libxi6
+libxine-dev
+libxine1
+libxinerama-dev
+libxinerama1
+libxkbfile-dev
+libxkbfile1
+libxkbui-dev
+libxkbui1
+libxklavier10
+libxml++1.0c2a
+libxml-dom-perl
+libxml-filter-buffertext
+libxml-libxml-common-per
+libxml-libxml-perl
+libxml-libxslt-perl
+libxml-namespacesupport-
+libxml-parser-perl
+libxml-perl
+libxml-regexp-perl
+libxml-rss-perl
+libxml-sablot-perl
+libxml-sax-machines-perl
+libxml-sax-perl
+libxml-sax-writer-perl
+libxml-simple-perl
+libxml-xpath-perl
+libxml1
+libxml2
+libxml2-dev
+libxml2-utils
+libxmu-dev
+libxmu-headers
+libxmu6
+libxmuu-dev
+libxmuu1
+libxp-dev
+libxp6
+libxplc0.3.13
+libxpm-dev
+libxpm4
+libxrandr-dev
+libxrandr2
+libxrender-dev
+libxrender1
+libxres-dev
+libxres1
+libxslt1-dev
+libxslt1.1
+libxss-dev
+libxss1
+libxt-dev
+libxt6
+libxtrap-dev
+libxtrap6
+libxtst-dev
+libxtst6
+libxul-common
+libxul0d
+libxv-dev
+libxv1
+libxvmc-dev
+libxvmc1
+libxxf86dga-dev
+libxxf86dga1
+libxxf86misc-dev
+libxxf86misc1
+libxxf86vm-dev
+libxxf86vm1
+libzipios++0c2a
+libzvbi-common
+libzvbi-dev
+libzvbi-doc
+libzvbi0
+libzvt2.0-0
+lilo
+lilypond-data
+lilypond-doc
+linneighborhood
+linphone
+linphone-common
+linphone-nox
+linux-image-2.6.19
+linux-kernel-headers-kno
+linux-sound-base
+linuxdoc-tools
+linuxdoc-tools-info
+linuxdoc-tools-latex
+linuxdoc-tools-text
+lisa
+loadlin
+locales
+lockfile-progs
+login
+logrotate
+lookup
+loop-aes-modules-2.6.19
+loop-aes-source
+loop-aes-utils
+lrzsz
+lsb
+lsb-base
+lsb-core
+lsb-cxx
+lsb-desktop
+lsb-graphics
+lsb-qt4
+lsb-release
+lsdvd
+lskat
+lsof
+ltrace
+lua50
+lvm-common
+lvm2
+lynx
+lyx
+lyx-common
+lyx-qt
+lyx-xforms
+lzop
+m17n-db
+m4
+macutils
+madwifi-modules-2.6.19
+madwifi-source
+madwifi-tools
+mailx
+make
+makedev
+man-db
+manpages
+manpages-de
+manpages-dev
+matwrap
+mawk
+maxima
+maxima-doc
+maxima-emacs
+maxima-share
+maxima-src
+maxima-test
+mayavi
+mbr
+mc
+mcl
+mcl-doc
+mdadm
+med-common
+med-tools
+medcon
+memtest86
+memtest86+
+memtester
+mencal
+menu
+menu-xdg
+mesa-common-dev
+mesa-utils
+metacity
+metacity-common
+metamail
+mgdiff
+mgp
+mikmod
+mime-support
+mimms
+mindi
+mindi-busybox
+mindi-kernel
+mindi-partimagehack
+minicom
+misdn-utils
+misdn-voipisdn
+mkbootdev
+mkdesktophdicons-knoppix
+mkdosswapfile-knoppix
+mkisofs
+mknbi
+mktemp
+mldonkey-gui
+mldonkey-server
+mlock
+mobilemesh
+modconf
+modemlink-knoppix
+modemtool-knoppix
+module-assistant
+module-init-tools
+modutils
+mondo
+mondo-doc
+mono
+mono-apache-server
+mono-common
+mono-devel
+mono-gac
+mono-gmcs
+mono-jay
+mono-jit
+mono-mcs
+mono-runtime
+mono-utils
+mono-xsp-base
+monodevelop
+monodoc-base
+monodoc-browser
+monodoc-http
+monodoc-manual
+monopd
+monotone
+mount
+mount-ntfs-knoppix
+mouseconfig
+mozilla-browser
+mozilla-firefox
+mozilla-helix-player
+mozilla-psm
+mozilla-thunderbird
+mozilla-thunderbird-insp
+mozilla-thunderbird-type
+mpack
+mpage
+mpg321
+mplayer
+mplayer-skin-blue
+mpqc
+mpqc-support
+ms-sys
+mt-st
+mtools
+mtr
+mtx
+multimix
+mutt
+myspell-bg
+myspell-de-at
+myspell-de-ch
+myspell-de-de
+myspell-en-gb
+myspell-en-us
+myspell-es
+myspell-fr
+myspell-it
+myspell-pl
+mysql-client
+mysql-client-5.0
+mysql-common
+mysql-server
+mysql-server-5.0
+mysql-zrm
+mysql-zrm-socket-server
+nagios-nrpe-plugin
+nagios-plugins-basic
+nagios2
+nagios2-common
+nagios2-doc
+nano
+nasm
+nautilus
+nautilus-cd-burner
+nautilus-data
+ncftp
+ncpfs
+ncurses-base
+ncurses-bin
+ncurses-term
+ndiswrapper-modules-2.6.
+ndiswrapper-source
+nedit
+nessus
+nessus-plugins
+nessusd
+net-tools
+netbase
+netcardconfig-knoppix
+netcat
+netcat6
+nethack-common
+nethack-console
+nethack-qt
+nethack-x11
+netpbm
+netpipe-tcp
+netpipes
+netris
+netspeed
+network-setup-knoppix
+networkconfig-knoppix
+networkstatus
+neverball
+neverdata
+nfs-common
+nfs-kernel-server
+ngrep
+nis
+nkf
+nmap
+noteedit
+noteedit-data
+nowebm
+nparted
+ntfs-3g
+ntfsprogs-knoppix
+ntpdate
+nvtv
+nvu
+nxagent
+nxclient
+nxdesktop
+nxlibs
+nxproxy
+nxsetup-knoppix
+nxssh
+nxtunnel-client
+nxtunnel-server
+oaf
+obconf
+ocaml-base-nox
+ocfs2-tools
+ocfs2console
+octave
+octave-epstk
+octave-sp
+octave-statdataml
+octave2.1
+octave2.9
+octave2.9-doc
+octave2.9-headers
+octave2.9-htmldoc
+odbc-postgresql
+odbcinst1debian1
+ofx
+oneko
+openbox
+openbsd-inetd
+openhackware
+openjade
+openjade1.3
+openoffice-de-en
+openoffice.org-debian-me
+opensched
+openssh-client
+openssh-server
+openssl
+openvpn
+outguess
+p0f
+pari-doc
+pari-extra
+pari-gp
+parted-bf
+partimage
+partimage-server
+passwd
+patch
+patchutils
+paw
+paw-common
+paw-demos
+pax
+pcb
+pciutils
+pciutils-dev
+pcmcia-cs
+pcmciautils
+pdl
+pentanet-doc
+pentanet-utils
+perl
+perl-base
+perl-doc
+perl-modules
+perl-suid
+perl-tk
+perlmagick
+pgapack
+pgdocs-pdf-a4
+pgf
+pgpgpg
+php5
+php5-common
+php5-gd
+php5-imap
+php5-ldap
+php5-mhash
+php5-mysql
+phpmyadmin
+pi
+pia
+pilot-link
+pinentry-qt
+pingus
+pingus-data
+pioneers-ai
+pioneers-client
+pioneers-help
+pioneers-server-console
+pioneers-server-data
+pioneers-server-gtk
+pkg-config
+planetpenguin-racer
+planetpenguin-racer-data
+planner
+playmidi
+playvideodisk-knoppix
+plib1.8.4c2
+plotutils
+pm-dev
+pmidi
+pmount
+pmtools
+pnm2ppa
+po-debconf
+portmap
+poster
+postgresql-8.0
+postgresql-client-8.0
+postgresql-client-common
+postgresql-common
+postgresql-contrib-8.0
+postgresql-doc-8.0
+postgresql-plperl-8.0
+postgresql-plpython-8.0
+postgresql-pltcl-8.0
+postgresql-server-dev-8.
+potrace
+powermgmt-base
+poxml
+ppmd
+ppp
+ppp-scripts-knoppix
+pppconfig
+pppdcapiplugin
+pppoe
+pppoeconf
+pppstatus
+pptp-linux
+prelink
+preview-latex-style
+print-utils-pfeifle
+prism54-nonfree
+procinfo
+procmail
+procps
+proj
+proll
+psfontmgr
+psgml
+psmisc
+pspp
+psutils
+pump
+pvm
+pxlib1
+pybliographer
+python
+python-alsaaudio
+python-apt
+python-bibtex
+python-cairo
+python-central
+python-dbus
+python-doc
+python-egenix-mxdatetime
+python-egenix-mxtools
+python-extclass
+python-glade2
+python-gmenu
+python-gnome2
+python-gnome2-desktop
+python-gst0.10
+python-gtk-1.2
+python-gtk2
+python-imaging
+python-imaging-doc
+python-imaging-doc-html
+python-imaging-doc-pdf
+python-imaging-tk
+python-ldap
+python-libxml2
+python-minimal
+python-netcdf
+python-numeric
+python-numeric-ext
+python-numeric-tutorial
+python-pygresql
+python-pyorbit
+python-pysqlite2
+python-scientific
+python-scientific-doc
+python-sigmask
+python-support
+python-tk
+python-vtk
+python-wxgtk2.4
+python-wxgtk2.6
+python-wxversion
+python-xml
+python2.1
+python2.3
+python2.3-dev
+python2.3-doc
+python2.4
+python2.4-doc
+python2.4-minimal
+qca-tls
+qcad
+qemu
+qm
+qmtest
+qobex
+qps
+qt3-assistant
+qt3-designer
+qt3-dev-tools
+qt3-doc
+qtparted
+quanta
+quanta-data
+quantlib-examples
+quantlib-python
+quantlib-refman
+quantlib-refman-html
+quantlib-ruby
+r-base
+r-base-core
+r-base-dev
+r-base-html
+r-base-latex
+r-cran-abind
+r-cran-acepack
+r-cran-boot
+r-cran-car
+r-cran-chron
+r-cran-cluster
+r-cran-coda
+r-cran-dbi
+r-cran-design
+r-cran-effects
+r-cran-foreign
+r-cran-gdata
+r-cran-gmodels
+r-cran-gplots
+r-cran-gregmisc
+r-cran-gtkdevice
+r-cran-gtools
+r-cran-hmisc
+r-cran-its
+r-cran-kernsmooth
+r-cran-lattice
+r-cran-lmtest
+r-cran-mapdata
+r-cran-maps
+r-cran-mcmcpack
+r-cran-mgcv
+r-cran-multcomp
+r-cran-mvtnorm
+r-cran-nlme
+r-cran-qtl
+r-cran-quadprog
+r-cran-rcmdr
+r-cran-relimp
+r-cran-rgl
+r-cran-rmysql
+r-cran-rodbc
+r-cran-rpart
+r-cran-rquantlib
+r-cran-sandwich
+r-cran-sm
+r-cran-statdataml
+r-cran-strucchange
+r-cran-survival
+r-cran-tkrplot
+r-cran-tseries
+r-cran-vr
+r-cran-xml
+r-cran-zoo
+r-doc-html
+r-doc-info
+r-doc-pdf
+r-mathlib
+r-recommended
+radio
+raptor-utils
+ratmenu
+ratpoison
+rcalc
+rcs
+rdate
+rdesktop
+readline-common
+realpath
+rebuildfstab-knoppix
+recode
+recover
+refblas3
+refblas3-dev
+reiserfsprogs
+reportbug
+request-tracker3
+request-tracker3.4
+resmgr
+restartx-knoppix
+rfb
+rhythmbox
+rocklight
+rootshell-knoppix
+rootstrap
+rosegarden
+rosegarden-data
+rosegarden4
+rplay-client
+rpm
+rsync
+rt2x00-cvs-modules-2.6.1
+rt3-clients
+rt3.4-apache
+rt3.4-clients
+rtai
+rtai-doc
+rtai-source
+rtfm
+rubber
+ruby
+ruby-examples
+ruby1.8
+rxp
+rxvt-beta
+s3switch
+samba
+samba-common
+sambastart-knoppix
+sane
+sane-utils
+sash
+saveconfig-knoppix
+sbcl
+sbl-auto-udeb
+scanmodem
+scanpartitions-knoppix
+scantv
+scli
+scons
+screen
+scribus
+scribus-doc-de
+scribus-doc-en
+scribus-doc-fr
+scrollkeeper
+scsitools
+scummvm
+sdic
+sdic-edict
+secpolicy
+sed
+selfhtml
+sendemail
+sendfile
+sendip
+setserial
+sfftobmp
+sffview
+sg3-utils
+sgml-base
+sgml-data
+sgmlspl
+sgmltools-lite
+shaper
+shared-mime-info
+sharutils
+sitar
+slang1
+slang1a-utf8
+slapd
+sleuthkit
+slib
+slirp
+slrn
+smail
+smake
+smartmontools
+smbclient
+smbconf-pfeifle
+smbconf-pfeifle-nonfree
+smbfs
+smpeg-plaympeg
+smpeg-xmms
+sndconfig-knoppix
+sniffit
+sodipodi
+sound-juicer
+sound-recorder
+soundcardconfig-knoppix
+sox
+sp
+speedtouch
+speex
+spell
+spellutils
+sqlite
+sqlite-doc
+squid
+squid-common
+squidclient
+ssh
+sshstart-knoppix
+ssl-cert
+sslwrap
+star
+startnessus-knoppix
+startsyslog-knoppix
+statserial
+stellarium
+stellarium-data
+strace
+stress
+stunnel
+subversion
+sudo
+sudoers-knoppix
+sufary
+sun-java5-bin
+sun-java5-demo
+sun-java5-fonts
+sun-java5-jdk
+sun-java5-jre
+sun-java5-plugin
+sunbird
+sweep
+swi-prolog
+sylpheed
+sylpheed-doc
+sylpheed-i18n
+symlinks
+synaptic
+sysklogd
+syslinux
+system-tools-backends
+sysv-rc
+sysvinit
+sysvinit-utils
+tar
+tcl8.3
+tcl8.4
+tclreadline
+tcpd
+tcpdump
+telnet-ssl
+telnetd-ssl
+terminatorx
+testdisk
+tetex-base
+tetex-bin
+tetex-doc
+tetex-extra
+tex-common
+tex4ht
+tex4ht-common
+texi2html
+texinfo
+texmacs
+texmacs-common
+tftp
+tftpd-hpa
+thttpd
+thunar
+thunderbird
+thunderbird-inspector
+thunderbird-locale-bg
+thunderbird-locale-cs
+thunderbird-locale-da
+thunderbird-locale-de
+thunderbird-locale-el
+thunderbird-locale-es-es
+thunderbird-locale-fi
+thunderbird-locale-fr
+thunderbird-locale-gu
+thunderbird-locale-he
+thunderbird-locale-hu
+thunderbird-locale-it
+thunderbird-locale-ja
+thunderbird-locale-ko
+thunderbird-locale-mk
+thunderbird-locale-nb
+thunderbird-locale-nl
+thunderbird-locale-ru
+thunderbird-locale-sk
+thunderbird-locale-sl
+thunderbird-locale-sv
+thunderbird-locale-tr
+thunderbird-locale-zh-cn
+thunderbird-typeaheadfin
+tidy
+tidy-doc
+tiger
+tightvncserver
+timeout
+timezoneconf
+timidity
+timidity-patches
+tint
+tix
+tk8.3
+tk8.4
+tkdiff
+tnef
+tofrodos
+tomcat5
+tomcat5-admin
+tomcat5-webapps
+toppler
+tora
+totem
+totem-mozilla
+totem-xine
+tpconfig
+traceroute
+trang
+trans-de-en
+transfig
+tripwire
+tsclient
+tshark
+tsocks
+ttf-arabeyes
+ttf-arphic-bsmi00lp
+ttf-bengali-fonts
+ttf-bitstream-vera
+ttf-dejavu
+ttf-devanagari-fonts
+ttf-dustin
+ttf-f500
+ttf-farsiweb
+ttf-freefont
+ttf-gentium
+ttf-gujarati-fonts
+ttf-indic-fonts
+ttf-isabella
+ttf-junicode
+ttf-kannada-fonts
+ttf-kochi-gothic
+ttf-malayalam-fonts
+ttf-openoffice
+ttf-opensymbol
+ttf-oriya-fonts
+ttf-punjabi-fonts
+ttf-sjfonts
+ttf-staypuft
+ttf-summersby
+ttf-tamil-fonts
+ttf-telugu-fonts
+ttmkfdir
+tuxeyes
+tuxkart
+tuxkart-data
+tuxmath
+tuxpaint
+tuxpaint-data
+tuxpaint-stamps-default
+tuxpuck
+tuxtype
+tuxtype-data
+tvtime
+twm
+txt2regex
+type-handling
+type1inst
+tzdata
+ucf
+udev
+udpcast
+umbrello
+uml-utilities
+umlrun
+umlrun-uml
+unifont
+units
+unixodbc
+unp
+unzip
+unzoo
+update
+update-inetd
+urlview
+usbutils
+usbview
+user-de
+user-mode-linux
+user-mode-linux-doc
+user-profile-knoppix
+usleep-knoppix
+util-linux
+util-linux-locales
+uudeview
+uuid-dev
+v4l-conf
+valgrind
+vcdimager
+vcdtools
+vdr
+vegastrike
+vegastrike-data
+vegastrike-music
+verilog
+vgabios
+vigor
+vim
+vim-common
+vim-gtk
+vim-gui-common
+vim-runtime
+vim-scripts
+vimpart
+vino
+vis5d-doc
+vlan
+vnc-common
+vorbis-tools
+vpnc
+vrms
+vtk-doc
+vtk-examples
+vtk-tcl
+w3-dtd-mathml
+w3c-dtd-xhtml
+w3m
+wakeonlan
+wamerican
+wavemon
+wavtools
+wbritish
+wcanadian
+wcatalan
+wfrench
+wget
+wheretero
+whiptail
+whisker
+whitespace
+whois
+wine
+wine-dev
+winetools
+wings3d
+wipe
+wireless-tools
+wireshark
+wireshark-common
+witalian
+wlcardconfig-knoppix
+wmaker
+wmaker-data
+wmaker-usersguide-ps
+wmakerconf
+wmakerconf-data
+wngerman
+wnorwegian
+wodim
+wordnet
+wordnet-base
+wordtrans-data
+wpasupplicant
+wpolish
+wprint
+wv
+wvdial
+wwwconfig-common
+wxmaxima
+x-ttcidfont-conf
+x11-common
+x11proto-bigreqs-dev
+x11proto-composite-dev
+x11proto-core-dev
+x11proto-damage-dev
+x11proto-dmx-dev
+x11proto-evie-dev
+x11proto-fixes-dev
+x11proto-fontcache-dev
+x11proto-fonts-dev
+x11proto-gl-dev
+x11proto-input-dev
+x11proto-kb-dev
+x11proto-print-dev
+x11proto-randr-dev
+x11proto-record-dev
+x11proto-render-dev
+x11proto-resource-dev
+x11proto-scrnsaver-dev
+x11proto-trap-dev
+x11proto-video-dev
+x11proto-xcmisc-dev
+x11proto-xext-dev
+x11proto-xf86bigfont-dev
+x11proto-xf86dga-dev
+x11proto-xf86dri-dev
+x11proto-xf86misc-dev
+x11proto-xf86vidmode-dev
+x11proto-xinerama-dev
+x3270
+xalan
+xaos
+xaw3dg
+xawtv
+xawtv-plugins
+xbase-clients
+xbattle
+xbitmaps
+xboard
+xboing
+xchat
+xchat-common
+xclass-common
+xcursor-themes
+xdelta
+xdg-utils
+xdialog
+xdm
+xemacs21
+xemacs21-basesupport
+xemacs21-bin
+xemacs21-mule
+xemacs21-mulesupport
+xemacs21-support
+xemacs21-supportel
+xen-docs-3.0
+xen-hypervisor-3.0-i386
+xen-utils-3.0.3-1
+xen-utils-common
+xfce
+xfce4
+xfce4-icon-theme
+xfce4-mcs-manager
+xfce4-mcs-plugins
+xfce4-mixer
+xfce4-mixer-alsa
+xfce4-panel
+xfce4-session
+xfce4-utils
+xfdesktop4
+xfig
+xfonts-100dpi
+xfonts-100dpi-transcoded
+xfonts-75dpi
+xfonts-75dpi-transcoded
+xfonts-base
+xfonts-base-transcoded
+xfonts-bolkhov-cp1251-75
+xfonts-bolkhov-cp1251-mi
+xfonts-dosemu
+xfonts-encodings
+xfonts-scalable
+xfonts-terminus
+xfonts-utils
+xfonts-x3270-misc
+xfprint4
+xfsdump
+xfsprogs
+xfwm4
+xfwm4-themes
+xgalaga
+xine-ui
+xjdic
+xkb-data
+xkbset
+xlib6g
+xlibmesa-gl
+xlibmesa-gl-dev
+xlibs
+xlibs-static-dev
+xloadimage
+xmaxima
+xmedcon
+xmhtml1
+xml-core
+xmms
+xmms-cdread
+xmms-goom
+xmms-modplug
+xmms-volnorm
+xnest
+xorg
+xorg-dev
+xorgconfig-knoppix
+xosview
+xpaint
+xpdf
+xpdf-common
+xpdf-reader
+xpdf-utils
+xppaut
+xsane
+xsane-common
+xscreensaver
+xscreensaver-gl
+xscreensaver-gnome
+xserver-xorg
+xserver-xorg-core
+xserver-xorg-dev
+xserver-xorg-input-all
+xserver-xorg-input-evdev
+xserver-xorg-input-kbd
+xserver-xorg-input-mouse
+xserver-xorg-input-synap
+xserver-xorg-input-wacom
+xserver-xorg-video-all
+xserver-xorg-video-apm
+xserver-xorg-video-ark
+xserver-xorg-video-ati
+xserver-xorg-video-chips
+xserver-xorg-video-cirru
+xserver-xorg-video-cyrix
+xserver-xorg-video-dummy
+xserver-xorg-video-fbdev
+xserver-xorg-video-glint
+xserver-xorg-video-i128
+xserver-xorg-video-i740
+xserver-xorg-video-i810
+xserver-xorg-video-imstt
+xserver-xorg-video-mga
+xserver-xorg-video-neoma
+xserver-xorg-video-newpo
+xserver-xorg-video-nsc
+xserver-xorg-video-nv
+xserver-xorg-video-rendi
+xserver-xorg-video-s3
+xserver-xorg-video-s3vir
+xserver-xorg-video-savag
+xserver-xorg-video-silic
+xserver-xorg-video-sis
+xserver-xorg-video-sisus
+xserver-xorg-video-tdfx
+xserver-xorg-video-tga
+xserver-xorg-video-tride
+xserver-xorg-video-tseng
+xserver-xorg-video-v4l
+xserver-xorg-video-vesa
+xserver-xorg-video-vga
+xserver-xorg-video-via
+xserver-xorg-video-vmwar
+xserver-xorg-video-voodo
+xsession-initscript-knop
+xsession-knoppix
+xskat
+xsltproc
+xterm
+xtightvncviewer
+xtrans-dev
+xtv
+xutils
+xutils-dev
+xviddetect
+xvier
+xvncviewer
+xvt
+xwpe
+xzoom
+yacas
+yacas-doc
+yacas-proteus
+yafray
+yelp
+yorick
+yorick-data
+yorick-doc
+zenity
+zile
+zip
+zlib-bin
+zlib1g
+zlib1g-dev
diff --git a/lists/rescue b/lists/rescue
index 2c849d6..e9a7567 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -3,28 +3,28 @@
## LH: Rescue
#<include> standard
-## System
+# System
gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
-## Editors
+# Editors
aview mc nano-tiny qemacs-nox mg vim wdiff
-## Harddisk
+# Harddisk
dosfstools dvd+rw-tools e2fsprogs ext2resize genisoimage hdparm blktool ntfsprogs parted partimage reiserfsprogs secure-delete scsitools smartmontools testdisk wodim wipe xfsprogs
-## System
+# System
dmidecode lshw pciutils procinfo read-edid sysutils usbutils mcelog
-## Browser
+# Browser
lynx links2 w3m
-## Compression
+# Compression
bzip2 rar unace unrar unzip zip
-## Backup
-#dar ddrescue gddrescue
+# Backup
+dar gddrescue
-## GENERAL
+# General
chrootuid
cryptcat
directvnc
@@ -33,6 +33,7 @@ etherwake
ftp
ifenslave-2.6
ifrename
+ethtool
ipcalc
mailx
mii-diag
@@ -48,7 +49,7 @@ socat
ssh
telnet
-## FIREWALLING
+# Firewalling
denyhosts
fail2ban
iptables
@@ -58,12 +59,12 @@ reaim
vlan
zorp
-## BRIDGING
+# Bridging
bridge-utils
ebtables
parprouted
-## ROUTING
+# Routing
cutter
iproute
iproute-doc
@@ -75,7 +76,7 @@ traceproto
traceroute
spinner
-## MONITORING
+# Monitoring
arpalert
arpwatch
atsar
@@ -109,7 +110,7 @@ tcpreen
tcpreplay
tshark
-## TESTING
+# Testing
crashme
dbench
doscan
@@ -134,13 +135,13 @@ paketto
sing
xprobe
-## LOG-ANALIZERS
+# Log Analzisers
fwanalog
fwlogwatch
lwatch
multitail
-#unsorted
+# unsorted
hwinfo hwtools x86info cpuid
tofrodos rpncalc
diff --git a/lists/studio b/lists/studio
new file mode 100644
index 0000000..f6f9c64
--- /dev/null
+++ b/lists/studio
@@ -0,0 +1,103 @@
+# /usr/share/live-helper/lists/studio - package list for live-helper(7)
+
+## LH: Music Studio base
+# packagelist inspired from the A/DeMuDi one.
+#
+# You don't want to use that list as a standalone list. Instead use
+# studio-* desktop variants.
+
+alsa-tools
+alsa-tools-gui
+ardour-gtk
+ams
+amsynth
+artsbuilder
+arts
+audacity
+aumix-gtk
+beast
+aterm
+bristol
+cdparanoia
+ceres3
+cheesetracker
+cmt
+cplay
+creox
+freewheeling
+ladspa-sdk
+lakai
+mcp-plugins
+mhwaveedit
+mikmod
+moosic
+mp3burn
+mp3info
+mpg321
+muse
+musiclibrarian
+noteedit
+nyquist
+openjade
+openssh
+pd-externals
+pd-zexy
+pmidi
+puredata
+pytone
+qjackctl
+qsynth
+realtime-lsm
+recode
+rev-plugins
+rezound
+ripperx
+rosegarden
+seq24
+sfftw2
+sfront
+solfege
+somaplayer
+songwrite
+soundtracker
+sox
+specimen
+spiralsynthmodular
+supercollider
+supercollider-doc
+swami
+sweep
+swh-plugins
+tap-plugins
+terminatorx
+timidity
+timemachine
+timidity-el
+timidity-interfaces-extra
+unison
+vkeybd
+vorbis-tools
+wavbreaker
+wavesurfer
+xmms
+xmms-bumpscope
+xmms-cdread
+xmms-crossfade
+xmms-flac
+xmms-fmradio
+xmms-goodnight
+xmms-iris
+xmms-jack
+xmms-jess
+xmms-ladspa
+xmms-lirc
+xmms-mad
+xmms-modplug
+xmms-msa
+xmms-osd-plugin
+xmms-qbble
+xmms-shell
+xmms-status-plugin
+xmms-synaesthesia
+xmms-volnorm
+zynaddsubfx
diff --git a/lists/studio-gnome b/lists/studio-gnome
new file mode 100644
index 0000000..767ae8c
--- /dev/null
+++ b/lists/studio-gnome
@@ -0,0 +1,5 @@
+# /usr/share/live-helper/lists/studio-gnome - package list for live-helper(7)
+
+## LH: Music Studio (Gnome)
+#<include> gnome
+#<include> studio
diff --git a/lists/studio-kde b/lists/studio-kde
new file mode 100644
index 0000000..5b0c73f
--- /dev/null
+++ b/lists/studio-kde
@@ -0,0 +1,5 @@
+# /usr/share/live-helper/lists/studio-kde - package list for live-helper(7)
+
+## LH: Music Studio (KDE)
+#<include> kde
+#<include> studio
diff --git a/lists/studio-xfce b/lists/studio-xfce
new file mode 100644
index 0000000..ef98c97
--- /dev/null
+++ b/lists/studio-xfce
@@ -0,0 +1,5 @@
+# /usr/share/live-helper/lists/studio-xfce - package list for live-helper(7)
+
+## LH: Music Studio (Xfce)
+#<include> xfce
+#<include> studio
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index 0d38ec7..367c7af 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_BINARY 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
@@ -52,7 +52,7 @@ kopiert yaboot in das Binary\-Image.
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index 3347efb..3d952aa 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_BINARY 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_binary \- meta\-helper for lh_binary_*
@@ -52,7 +52,7 @@ copies yaboot into the binary image.
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1
index ef974e4..08c70bf 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_BOOTSTRAP 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
@@ -22,7 +22,7 @@ erstellt ein Debian-System mit debootstrap.
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index e7a377d..4afda05 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_bootstrap \- meta\-helper for lh_bootstrap_*
@@ -22,7 +22,7 @@ bootstraps system with debootstrap.
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1
index 5e05fb9..c97da1b 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
@@ -19,15 +19,15 @@ kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap)
.IP "\fI$LH_CACHE\fR" 4
kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+.IP "\fI$LH_ARCHITECTURE\fR" 4
w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+.IP "\fI$LH_BOOTSTRAP_CONFIG\fR" 4
bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+.IP "\fI$LH_BOOTSTRAP_FLAVOUR\fR" 4
w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+.IP "\fI$LH_DISTRIBUTION\fR" 4
w\[:a]hlt die Distribution aus (Standard: etch)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+.IP "\fI$LH_MIRROR_BUILD\fR" 4
bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
.SH SIEHE AUCH
@@ -38,7 +38,7 @@ bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index d6368d3..09252ca 100644
--- a/manpages/lh_bootstrap_cdebootstrap.en.1
+++ b/manpages/lh_bootstrap_cdebootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
@@ -19,15 +19,15 @@ control the bootstrap program to be used (Default: cdebootstrap)
.IP "\fI$LH_CACHE\fR" 4
control if downloaded packages should be cached (Default: enabled)
.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+.IP "\fI$LH_ARCHITECTURE\fR" 4
select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+.IP "\fI$LH_BOOTSTRAP_CONFIG\fR" 4
set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+.IP "\fI$LH_BOOTSTRAP_FLAVOUR\fR" 4
select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+.IP "\fI$LH_DISTRIBUTION\fR" 4
select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+.IP "\fI$LH_MIRROR_BUILD\fR" 4
set the mirror to use (Default: http://ftp.debian.org/debian/)
.SH SEE ALSO
@@ -38,7 +38,7 @@ set the mirror to use (Default: http://ftp.debian.org/debian/)
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1
index c3e848b..1dd7790 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
@@ -19,15 +19,15 @@ kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap)
.IP "\fI$LH_CACHE\fR" 4
kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+.IP "\fI$LH_ARCHITECTURE\fR" 4
w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+.IP "\fI$LH_BOOTSTRAP_CONFIG\fR" 4
bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+.IP "\fI$LH_BOOTSTRAP_FLAVOUR\fR" 4
w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+.IP "\fI$LH_DISTRIBUTION\fR" 4
w\[:a]hlt die Distribution aus (Standard: etch)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+.IP "\fI$LH_MIRROR_BUILD\fR" 4
bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
.SH SIEHE AUCH
@@ -38,7 +38,7 @@ bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index ada7137..524b3d6 100644
--- a/manpages/lh_bootstrap_debootstrap.en.1
+++ b/manpages/lh_bootstrap_debootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
@@ -19,15 +19,15 @@ control the bootstrap program to be used (Default: cdebootstrap)
.IP "\fI$LH_CACHE\fR" 4
control if downloaded packages should be cached (Default: enabled)
.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+.IP "\fI$LH_ARCHITECTURE\fR" 4
select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+.IP "\fI$LH_BOOTSTRAP_CONFIG\fR" 4
set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+.IP "\fI$LH_BOOTSTRAP_FLAVOUR\fR" 4
select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+.IP "\fI$LH_DISTRIBUTION\fR" 4
select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+.IP "\fI$LH_MIRROR_BUILD\fR" 4
set the mirror to use (Default: http://ftp.debian.org/debian/)
.SH SEE ALSO
@@ -38,7 +38,7 @@ set the mirror to use (Default: http://ftp.debian.org/debian/)
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1
index 6fb578d..b7f7177 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_BUILD 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_build \- erstellen eines Live-Systemes
@@ -26,7 +26,7 @@ erstellt ein Source-Image.
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index 8bcd527..115d13d 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_BUILD 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_build \- building a live system
@@ -26,7 +26,7 @@ builds a source image.
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1
index 93100f0..d9263a7 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_CHROOT 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
@@ -62,7 +62,7 @@ installiert Paket-Tasks im chroot.
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index ff3f8e7..f5cef11 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_CHROOT 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_chroot \- meta\-helper for lh_chroot_*
@@ -62,7 +62,7 @@ installs tasks into chroot.
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1
index 377325b..49d575c 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_CLEAN 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_clean \- r\[:a]umt das Build-Verzeichnis auf
@@ -33,7 +33,7 @@ entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe.
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index 1b8a11e..c45003c 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_CLEAN 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_clean \- clean up system build directories
@@ -33,7 +33,7 @@ removes all source related caches, directories, and stage files.
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1
index 37815c7..261df0e 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_SOURCE 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_source \- Meta\-Helper f\[:u]r lh_source_*
@@ -32,7 +32,7 @@ erstellt USB-hdd Source-Tarball.
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index 2172440..f53f20a 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_SOURCE 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_source \- meta\-helper for lh_source_*
@@ -32,7 +32,7 @@ creates the USB-hdd source image.
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1
index 810c606..5868395 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LH_TESTROOT 1 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
lh_testroot \- stellt sicher dass das System als root gebaut wird
@@ -15,7 +15,7 @@ lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit
Dieses Programm ist Teil von live\-helper.
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index c748a07..f92857a 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
lh_testroot \- ensure that a system is built as root
@@ -15,7 +15,7 @@ lh_testroot simply checks to see if you are root. If not, it exits with an error
This program is a part of live\-helper.
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7
index 766ee0d..e996a25 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "30.07.2007" "1.0~a21" "live\-helper"
+.TH LIVE\-HELPER 7 "06.08.2007" "1.0~a22" "live\-helper"
.SH NAME
live\-helper \- Debian Live Helper-Programme
@@ -169,7 +169,7 @@ gibt Versionsinformationen aus und stoppt.
\fIlive\-webhelper\fR(7)
.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden.
.SH HOMEPAGE
Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index 725a8f5..23f68e1 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-07\-30" "1.0~a21" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-08\-06" "1.0~a22" "live\-helper"
.SH NAME
live\-helper \- Debian Live helper programs
@@ -167,7 +167,7 @@ output version information and exit
\fIlive\-webhelper\fR(7)
.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>.
.SH HOMEPAGE
More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
diff --git a/templates/syslinux/f1.txt.install b/templates/syslinux/f1.txt.install
index a26234f..80026b6 100644
--- a/templates/syslinux/f1.txt.install
+++ b/templates/syslinux/f1.txt.install
@@ -1,7 +1,7 @@
0fWelcome to Debian GNU/Linux!07 09F107
-This is a Debian LIVE_DISTRIBUTION combined live and installation LIVE_MEDIA.
-It was built on LIVE_DATE.
+This is a Debian LH_DISTRIBUTION combined live and installation LH_MEDIA.
+It was built on LH_DATE.
0fHELP INDEX07
@@ -9,7 +9,7 @@ It was built on LIVE_DATE.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this LIVE_MEDIA
+<09F307> Boot methods for special ways of using this LH_MEDIA
<09F407> Additional boot methods; rescue mode.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
diff --git a/templates/syslinux/f1.txt.live b/templates/syslinux/f1.txt.live
index 5a6aecf..f6f33ef 100644
--- a/templates/syslinux/f1.txt.live
+++ b/templates/syslinux/f1.txt.live
@@ -1,7 +1,7 @@
0fWelcome to Debian GNU/Linux!07 09F107
-This is a Debian LIVE_DISTRIBUTION live LIVE_MEDIA.
-It was built on LIVE_DATE.
+This is a Debian LH_DISTRIBUTION live LH_MEDIA.
+It was built on LH_DATE.
0fHELP INDEX07
@@ -9,7 +9,7 @@ It was built on LIVE_DATE.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this LIVE_MEDIA
+<09F307> Boot methods for special ways of using this LH_MEDIA
<09F407> Additional boot methods.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
diff --git a/templates/syslinux/f10.txt b/templates/syslinux/f10.txt
index a1ce656..3cf379e 100644
--- a/templates/syslinux/f10.txt
+++ b/templates/syslinux/f10.txt
@@ -12,7 +12,7 @@ permitted by applicable law.
---
-This Debian Live system was built with live-helper, version LIVE_VERSION.
+This Debian Live system was built with live-helper, version LH_VERSION.
More information about the Debian Live project can be found at
<http://debian-live.alioth.debian.org/>.
diff --git a/templates/syslinux/f3.txt.install b/templates/syslinux/f3.txt.install
index db59717..233f267 100644
--- a/templates/syslinux/f3.txt.install
+++ b/templates/syslinux/f3.txt.install
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default LIVE_MEDIA method.
+ Start the live system -- this is the default LH_MEDIA method.
0flive-failsafe07
Start the live system in fail-safe mode.
0finstall07
diff --git a/templates/syslinux/f3.txt.install.g-i b/templates/syslinux/f3.txt.install.g-i
index 445ddbd..745685d 100644
--- a/templates/syslinux/f3.txt.install.g-i
+++ b/templates/syslinux/f3.txt.install.g-i
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default LIVE_MEDIA method.
+ Start the live system -- this is the default LH_MEDIA method.
0flive-failsafe07
Start the live system in fail-safe mode.
0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/f3.txt.live b/templates/syslinux/f3.txt.live
index 397c649..b48ab8d 100644
--- a/templates/syslinux/f3.txt.live
+++ b/templates/syslinux/f3.txt.live
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default LIVE_MEDIA method.
+ Start the live system -- this is the default LH_MEDIA method.
0flive-failsafe07
Start the live system in fail-safe mode.
diff --git a/templates/syslinux/syslinux.cfg b/templates/syslinux/syslinux.cfg
index 48599ed..6c3ba7f 100644
--- a/templates/syslinux/syslinux.cfg
+++ b/templates/syslinux/syslinux.cfg
@@ -33,4 +33,4 @@ LABEL nextboot
localboot -1
PROMPT 1
-TIMEOUT 0
+TIMEOUT LINUX_TIMEOUT
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
index 8fc17b0..98f5876 100644
--- a/templates/yaboot/boot.msg
+++ b/templates/yaboot/boot.msg
@@ -1,7 +1,7 @@
Welcome to Debian GNU/Linux!
This is a Debian Live CDROM,
-built on LIVE_DATE.
+built on LH_DATE.
The default option is 'live'.
diff --git a/templates/yaboot/pegasos b/templates/yaboot/pegasos
index 7a8758a..1e1b241 100644
--- a/templates/yaboot/pegasos
+++ b/templates/yaboot/pegasos
@@ -18,7 +18,7 @@
." Welcome to Debian GNU/Linux!" cr
." " cr
." This is a Debian Live CDROM," cr
- ." built on LIVE_DATE." cr
+ ." built on LH_DATE." cr
." " cr
." The default option is 'live'." cr
." " cr
--
cgit v1.0