From 85c342c299231131d22764c0dfdcf977c57ce147 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:11 +0200
Subject: Adding live-helper 1.0~a13-1.
---
Makefile | 11 +-
debian/changelog | 6 +
debian/control | 12 +-
debian/manpages | 1 -
debian/postrm | 4 +-
docs/CREDITS | 1 +
docs/ChangeLog | 34 +++++
docs/TODO | 7 +-
examples/cron/etch+beryl.sh | 6 +-
examples/cron/etch.sh | 2 +-
examples/cron/snapshots.sh | 26 ++--
functions/cache.sh | 7 +-
functions/common.sh | 2 +-
functions/defaults.sh | 219 ++++++++--------------------
functions/lockfile.sh | 5 +-
functions/stagefile.sh | 5 +-
helpers/lh_binary | 13 +-
helpers/lh_binary_chroot | 16 +-
helpers/lh_binary_debian-installer | 14 +-
helpers/lh_binary_encryption | 14 +-
helpers/lh_binary_grub | 19 +--
helpers/lh_binary_hdd | 53 +++----
helpers/lh_binary_includes | 14 +-
helpers/lh_binary_iso | 207 +++++++++++++-------------
helpers/lh_binary_linux-image | 19 +--
helpers/lh_binary_local-includes | 16 +-
helpers/lh_binary_manifest | 14 +-
helpers/lh_binary_md5sum | 14 +-
helpers/lh_binary_memtest | 19 +--
helpers/lh_binary_net | 85 ++++++-----
helpers/lh_binary_rootfs | 27 ++--
helpers/lh_binary_syslinux | 21 ++-
helpers/lh_binary_usb-hdd | 251 ++++++++++++++++----------------
helpers/lh_binary_yaboot | 19 +--
helpers/lh_bootstrap | 17 +--
helpers/lh_bootstrap_cdebootstrap | 42 +++---
helpers/lh_bootstrap_debootstrap | 37 ++---
helpers/lh_build | 17 +--
helpers/lh_chroot | 15 +-
helpers/lh_chroot_apt | 28 ++--
helpers/lh_chroot_debianchroot | 14 +-
helpers/lh_chroot_hacks | 14 +-
helpers/lh_chroot_hooks | 18 +--
helpers/lh_chroot_hosts | 14 +-
helpers/lh_chroot_interactive | 16 +-
helpers/lh_chroot_linux-image | 14 +-
helpers/lh_chroot_local-hooks | 16 +-
helpers/lh_chroot_local-includes | 16 +-
helpers/lh_chroot_local-packages | 16 +-
helpers/lh_chroot_local-packageslists | 16 +-
helpers/lh_chroot_localization | 49 ++-----
helpers/lh_chroot_packages | 14 +-
helpers/lh_chroot_packageslists | 18 +--
helpers/lh_chroot_preseed | 76 ++++++++++
helpers/lh_chroot_proc | 21 ++-
helpers/lh_chroot_resolv | 14 +-
helpers/lh_chroot_sources | 39 +++--
helpers/lh_chroot_symlinks | 42 +++---
helpers/lh_chroot_sysfs | 21 ++-
helpers/lh_chroot_sysvinit | 14 +-
helpers/lh_chroot_sysvrc | 14 +-
helpers/lh_chroot_tasks | 14 +-
helpers/lh_clean | 12 +-
helpers/lh_config | 41 +++---
helpers/lh_losetup | 14 +-
helpers/lh_source | 14 +-
helpers/lh_source_debian | 16 +-
helpers/lh_source_debian-live | 16 +-
helpers/lh_source_generic | 63 ++++----
helpers/lh_source_hdd | 63 ++++----
helpers/lh_source_iso | 119 ++++++++-------
helpers/lh_source_md5sum | 16 +-
helpers/lh_source_net | 61 ++++----
helpers/lh_source_usb-hdd | 161 ++++++++++----------
helpers/lh_testroot | 12 +-
helpers/make-live | 17 +--
includes/etch/live/boot-parameters.txt | 40 +++++
lists/mini | 4 -
lists/minimal | 4 -
manpages/lh_binary.de.1 | 2 +-
manpages/lh_binary.en.1 | 2 +-
manpages/lh_bootstrap.de.1 | 2 +-
manpages/lh_bootstrap.en.1 | 2 +-
manpages/lh_bootstrap_cdebootstrap.de.1 | 2 +-
manpages/lh_bootstrap_cdebootstrap.en.1 | 2 +-
manpages/lh_bootstrap_debootstrap.de.1 | 2 +-
manpages/lh_bootstrap_debootstrap.en.1 | 2 +-
manpages/lh_build.de.1 | 2 +-
manpages/lh_build.en.1 | 2 +-
manpages/lh_chroot.de.1 | 2 +-
manpages/lh_chroot.en.1 | 2 +-
manpages/lh_clean.de.1 | 2 +-
manpages/lh_clean.en.1 | 2 +-
manpages/lh_source.de.1 | 2 +-
manpages/lh_source.en.1 | 2 +-
manpages/lh_testroot.de.1 | 2 +-
manpages/lh_testroot.en.1 | 2 +-
manpages/live-helper.de.7 | 6 +-
manpages/live-helper.en.7 | 6 +-
manpages/make-live.de.1 | 2 +-
manpages/make-live.en.1 | 2 +-
101 files changed, 1275 insertions(+), 1279 deletions(-)
delete mode 100644 debian/manpages
create mode 100755 helpers/lh_chroot_preseed
create mode 100644 includes/etch/live/boot-parameters.txt
delete mode 100644 lists/mini
delete mode 100644 lists/minimal
diff --git a/Makefile b/Makefile
index 71814fd..a598ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -88,21 +88,18 @@ uninstall:
done; \
done
- # Uninstalling logfile
- rm -f $(DESTDIR)/var/log/live*
-
update:
set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
do \
- sed -i -e 's/2007\\-05\\-21/2007\\-05\\-28/' \
- -e 's/21.05.2007/28.05.2007/' \
- -e 's/1.0~a11/1.0~a12/' \
+ sed -i -e 's/2007\\-06\\-04/2007\\-06\\-11/' \
+ -e 's/04.06.2007/11.06.2007/' \
+ -e 's/1.0~a13/1.0~a14/' \
$$MANPAGE; \
done
set -e; for SCRIPT in functions/common.sh examples/cron/etch.sh examples/cron/etch+beryl.sh; \
do \
- sed -i -e 's/1.0~a11/1.0~a12/' $$SCRIPT; \
+ sed -i -e 's/1.0~a13/1.0~a14/' $$SCRIPT; \
done
clean:
diff --git a/debian/changelog b/debian/changelog
index b8648fe..5fa0375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a13-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 4 Jun 2007 00:00:00 +0200
+
live-helper (1.0~a12-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 2e2aac1..c1e288d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/
Package: live-helper
Architecture: all
Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2)
-Conflicts: live-package
+Conflicts: live-package (<< 1.0)
Replaces: live-package
Provides: make-live
Description: Debian Live helper programs
@@ -25,3 +25,13 @@ Description: Debian Live helper programs
of such a program that uses live-helper is make-live (included here).
.
Homepage: <http://debian-live.alioth.debian.org/>
+
+Package: live-package
+Architecture: all
+Depends: live-helper
+Description: Debian Live helper programs (transitional package)
+ Package to ease upgrading from older live-package package to the new
+ live-helper package.
+ .
+ This package can be purged at anytime once the live-helper package has been
+ installed.
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index ae53c6c..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-contrib/casper-manpage/*
diff --git a/debian/postrm b/debian/postrm
index 09b0aca..9778835 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,7 +2,7 @@
set -e
-case "$1" in
+case "${1}" in
purge)
rm -f /var/log/live*
;;
@@ -12,7 +12,7 @@ case "$1" in
;;
*)
- echo "postrm called with unknown argument \`$1'" >&2
+ echo "postrm called with unknown argument \`${1}'" >&2
exit 1
;;
esac
diff --git a/docs/CREDITS b/docs/CREDITS
index 1304663..b641382 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -17,6 +17,7 @@ Patches (alphabetical order):
* Richard Nelson <rjent@rjent.pair.com>
* Scott Edwards <debian@foss.daxal.com>
* Sebastian Raveau <sebastien.raveau@epita.fr>
+ * Trent Buck <trentbuck@gmail.com>
Donations (alphaetical order):
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 277ff48..4901025 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,37 @@
+2007-06-03 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 1.0~a13-1.
+
+2007-06-02 Otavio Salvador <otavio@debian.org>
+
+ * helpers/lh_chroot_preseed:
+ - Use {Check,Install,Remove}_package to handle debconf dependency.
+ * Add support to specify the apt/aptitude pipeline depth.
+
+2007-06-02 Daniel Baumann <daniel@debian.org>
+
+ * Applied patches from Otavio Salvador <otavio@debian.org>:
+ - Add support to override helpers base directory
+ - Use LIVE_BOOTSTRAP_CONFIG instead of LIVE_DISTRIBUTION_CONFIG.
+ - Add support to specify the keyring to be used while bootstraping.
+ - Add lh_chroot_preseed helper.
+
+2007-05-28 Daniel Baumann <daniel@debian.org>
+
+ * helpers/*:
+ - Added initial P: messages.
+ - Removed some bashisms.
+ - Added some of the proposed cleanups from Trent Buck
+ <trentbuck@gmail.com>.
+ * lists/mini, minimal:
+ - Removed, already pulled in with live-initramfs depends.
+
+2007-05-27 Daniel Baumann <daniel@debian.org>
+
+ * helpers/lh_binary_rootfs:
+ - Added check for config/binary_rootfs/squashfs.sort for passing a
+ sorting list to mksquashfs.
+
2007-05-26 Daniel Baumann <daniel@debian.org>
* lists/rescue:
diff --git a/docs/TODO b/docs/TODO
index 62ae5c0..c4e25e6 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -14,11 +14,11 @@ FIXME
* grub (i386/amd64) boot support on usb* binary images
* grub (i386/amd64) boot support on net binary images
* multi-{binary,architecture,distribution} builds in one shot
- * vmlinu[xz]
- * breakpoints (yes/no/all/type: soft ->interaction to stop/hard ->interaction to continue)
* check unset variables
ADDME
+ * vmlinu[xz] [ppc64?]
+ * breakpoints (yes/no/all/type: soft ->interaction to stop/hard ->interaction to continue)
* vmware binary image flavour
* usb-zip binary image flavour
* support splitted/partial squashfs images
@@ -26,7 +26,7 @@ ADDME
* introduce package groups
* multi-arch for amd64/i386/powerpc on one medium
* logfiles
- * re-import lh_clone/lh_preseed
+ * re-import lh_clone
* Add win32 loader
BETA series:
@@ -45,3 +45,4 @@ POST 1.0:
* Add loadlin or qemu batch
* Adding colinux?
* exec wrapper for output hiding/handling
+ * bootchart and squashfs sorting integration
diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh
index 28a51b5..66ed123 100755
--- a/examples/cron/etch+beryl.sh
+++ b/examples/cron/etch+beryl.sh
@@ -7,7 +7,7 @@ BUILD="etch+beryl"
# Begin custom defaults
AUTOBUILD="enabled"
-DATE="r0_1.0~a12-1"
+DATE="r0_1.0~a13-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
@@ -75,8 +75,8 @@ do
mkdir -p debian-live/config/chroot_sources
wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg
wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg
- cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.build
- cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.image
+ cp /usr/share/live-helper/examples/sources/beryl debian-live/config/chroot_sources/beryl.build
+ cp /usr/share/live-helper/examples/sources/beryl debian-live/config/chroot_sources/beryl.image
# 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
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index cf8ec2e..e4cbb55 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -7,7 +7,7 @@ BUILD="etch"
# Begin custom defaults
AUTOBUILD="enabled"
-DATE="r0_1.0~a12-1"
+DATE="r0_1.0~a13-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh
index 760b041..655d512 100755
--- a/examples/cron/snapshots.sh
+++ b/examples/cron/snapshots.sh
@@ -3,7 +3,7 @@
# Needs: build-essential fakeroot lsb-release svn [...]
# Static variables
-PACKAGES="live-helper live-initramfs live-webhelper"
+PACKAGES="live-helper live-initramfs live-sysvinit live-webhelper"
DEBEMAIL="debian-live-devel@lists.alioth.debian.org"
EMAIL="debian-live-devel@lists.alioth.debian.org"
@@ -80,19 +80,23 @@ do
rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
# Creating directory
- if [ ! -d "${SERVER}" ]
- then
- mkdir -p "${SERVER}"
- fi
+ mkdir -p "${SERVER}"
# Removing old packages
- if ls "${SERVER}"/"${PACKAGE}"* &> /dev/null
- then
- rm -f "${SERVER}"/"${PACKAGE}"*
- fi
+ for FILE in `awk {'print $5'} "${SERVER}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$"`
+ do
+ rm -f "${SERVER}"/"${FILE}"
+ done
- # Moving packages
- mv "${TEMPDIR}"/${PACKAGE}* "${SERVER}"
+ rm -f "${SERVER}"/"${PACKAGE}"*.changes
+
+ # Installing new packages
+ for FILE in `awk {'print $5'} "${TEMPDIR}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$"`
+ do
+ mv "${TEMPDIR}"/"${FILE}" "${SERVER}"
+ done
+
+ mv "${TEMPDIR}"/"${PACKAGE}"*.changes "${SERVER}"
else
# Remove sources
rm -rf "${TEMPDIR}"/${PACKAGE}
diff --git a/functions/cache.sh b/functions/cache.sh
index 94d6bc2..d83b7e1 100755
--- a/functions/cache.sh
+++ b/functions/cache.sh
@@ -32,13 +32,10 @@ Save_cache ()
# Cleaning current cache
Chroot "apt-get autoclean"
- if ls chroot/var/cache/apt/archives/*.deb &> /dev/null
+ if ls chroot/var/cache/apt/archives/*.deb > /dev/null 2>&1
then
# Creating cache directory
- if [ ! -d "${DIRECTORY}" ]
- then
- mkdir -p "${DIRECTORY}"
- fi
+ mkdir -p "${DIRECTORY}"
# Saving new cache
mv -f chroot/var/cache/apt/archives/*.deb "${DIRECTORY}"
diff --git a/functions/common.sh b/functions/common.sh
index 604d15a..19e2566 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
-VERSION="1.0~a12"
+VERSION="1.0~a13"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ccba6f8..3c80b90 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -16,7 +16,7 @@ Set_defaults ()
# Setting mode
if [ -z "${LH_MODE}" ]
then
- if [ -f /usr/bin/lsb_release ]
+ if [ -x /usr/bin/lsb_release ]
then
case "`lsb_release --short --id`" in
Debian)
@@ -26,18 +26,35 @@ Set_defaults ()
Ubuntu)
LH_MODE="ubuntu"
;;
+
+ *)
+ Echo_verbose "Unexpected output from lsb_release"
+ Echo_verbose "Setting mode to debian."
+ LH_MODE="debian"
+ ;;
esac
else
LH_MODE="debian"
fi
fi
- # Setting package manager
- if [ -z "${LH_APT}" ]
+ # Setting distribution value
+ if [ -z "${LIVE_DISTRIBUTION}" ]
then
- LH_APT="aptitude"
+ case "${LH_MODE}" in
+ debian)
+ LIVE_DISTRIBUTION="etch"
+ ;;
+
+ ubuntu)
+ LIVE_DISTRIBUTION="feisty"
+ ;;
+ esac
fi
+ # Setting package manager
+ LH_APT="${LH_APT:-aptitude}"
+
# Setting apt ftp proxy
if [ -z "${LH_APT_FTPPROXY}" ] && [ -n "${ftp_proxy}" ]
then
@@ -61,22 +78,16 @@ Set_defaults ()
fi
# Setting apt pdiffs
- if [ -z "${LH_APT_PDIFFS}" ]
- then
- LH_APT_PDIFFS="enabled"
- fi
+ LH_APT_PDIFFS="${LH_APT_PDIFFS:-enabled}"
+
+ # Setting apt pipeline
+ # LH_APT_PIPELINE
# Setting apt recommends
- if [ -z "${LH_APT_RECOMMENDS}" ]
- then
- LH_APT_RECOMMENDS="enabled"
- fi
+ LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
# Setting apt secure
- if [ -z "${LH_APT_SECURE}" ]
- then
- LH_APT_SECURE="enabled"
- fi
+ LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
# Setting bootstrap program
if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ]
@@ -111,36 +122,14 @@ Set_defaults ()
fi
# Setting cache option
- if [ -z "${LH_CACHE_INDICES}" ]
- then
- LH_CACHE_INDICES="disabled"
- fi
-
- if [ -z "${LH_CACHE_PACKAGES}" ]
- then
- LH_CACHE_PACKAGES="enabled"
- fi
-
- if [ -z "${LH_CACHE_STAGES}" ]
- then
- LH_CACHE_STAGES="bootstrap"
- fi
+ LH_CACHE_INDICES="${LH_CACHE_INDICES:-disabled}"
+ LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-enabled}"
+ LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}"
# Setting debconf frontend
- if [ -z "${LH_DEBCONF_FRONTEND}" ]
- then
- LH_DEBCONF_FRONTEND="noninteractive"
- fi
-
- if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
- then
- LH_DEBCONF_NOWARNINGS="yes"
- fi
-
- if [ -z "${LH_DEBCONF_PRIORITY}" ]
- then
- LH_DEBCONF_PRIORITY="critical"
- fi
+ LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND:-noninteractive}"
+ LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
+ LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}"
# Setting genisoimage
if [ -z "${LH_GENISOIMAGE}" ]
@@ -185,15 +174,12 @@ Set_defaults ()
# If we are root, disable root command
if [ "`id -u`" = "0" ]
then
- # FIXME: this is disabled until considered save
+ # FIXME: this is disabled until considered safe
LIVE_ROOT_COMMAND=""
fi
# Setting tasksel
- if [ -z "${LH_TASKSEL}" ]
- then
- LH_TASKSEL="aptitude"
- fi
+ LH_TASKSEL="${LH_TASKSEL:-aptitude}"
# Setting root directory
if [ -z "${LIVE_ROOT}" ]
@@ -212,40 +198,21 @@ Set_defaults ()
# Setting includes
if [ -z "${LIVE_INCLUDES}" ]
then
- LIVE_INCLUDES="/usr/share/live-helper/includes"
+ LIVE_INCLUDES="${LH_BASE:-/usr/share/live-helper}/includes"
fi
# Setting templates
if [ -z "${LIVE_TEMPLATES}" ]
then
- LIVE_TEMPLATES="/usr/share/live-helper/templates"
+ LIVE_TEMPLATES="${LH_BASE:-/usr/share/live-helper}/templates"
fi
# Setting live helper options
- if [ -z "${LH_BREAKPOINTS}" ]
- then
- LH_BREAKPOINTS="disabled"
- fi
-
- if [ -z "${LH_DEBUG}" ]
- then
- LH_DEBUG="disabled"
- fi
-
- if [ -z "${LH_FORCE}" ]
- then
- LH_FORCE="disabled"
- fi
-
- if [ -z "${LH_QUIET}" ]
- then
- LH_QUIET="disabled"
- fi
-
- if [ -z "${LH_VERBOSE}" ]
- then
- LH_VERBOSE="disabled"
- fi
+ LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}"
+ LH_DEBUG="${LH_DEBUG:-disabled}"
+ LH_FORCE="${LH_FORCE:-disabled}"
+ LH_QUIET="${LH_QUIET:-disabled}"
+ LH_VERBOSE="${LH_VERBOSE:-disabled}"
## config/bootstrap
@@ -261,28 +228,14 @@ Set_defaults ()
fi
fi
- # Setting distribution value
- if [ -z "${LIVE_DISTRIBUTION}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_DISTRIBUTION="etch"
- ;;
-
- ubuntu)
- LIVE_DISTRIBUTION="feisty"
- ;;
- esac
- fi
-
# Setting distribution configuration value
# LIVE_BOOTSTRAP_CONFIG
# Setting flavour value
- if [ -z "${LIVE_BOOTSTRAP_FLAVOUR}" ]
- then
- LIVE_BOOTSTRAP_FLAVOUR="standard"
- fi
+ LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR:-standard}"
+
+ # Setting boostrap keyring
+ # LIVE_BOOTSTRAP_KEYRING
# Setting mirror to fetch packages from
if [ -z "${LIVE_MIRROR_BOOTSTRAP}" ]
@@ -357,18 +310,12 @@ Set_defaults ()
## config/chroot
# Setting chroot filesystem
- if [ -z "${LIVE_CHROOT_FILESYSTEM}" ]
- then
- LIVE_CHROOT_FILESYSTEM="squashfs"
- fi
+ LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}"
# LIVE_HOOKS
# Setting interactive shell/X11/Xnest
- if [ -z "${LIVE_INTERACTIVE}" ]
- then
- LIVE_INTERACTIVE="disabled"
- fi
+ LIVE_INTERACTIVE="${LIVE_INTERACTIVE:-disabled}"
# Setting keyring packages
# LIVE_KEYRING_PACKAGES
@@ -476,10 +423,7 @@ Set_defaults ()
# LIVE_PACKAGES
# Setting packages list string
- if [ -z "${LIVE_PACKAGES_LISTS}" ]
- then
- LIVE_PACKAGES_LISTS="standard"
- fi
+ LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
# Setting tasks string
for LIST in ${LIVE_PACKAGES_LISTS}
@@ -513,36 +457,21 @@ Set_defaults ()
# LIVE_TASKS
# Setting security updates option
- if [ -z "${LIVE_SECURITY}" ]
- then
- LIVE_SECURITY="enabled"
- fi
+ LIVE_SECURITY="${LIVE_SECURITY:-enabled}"
# Setting symlink convertion option
- if [ -z "${LIVE_SYMLINKS}" ]
- then
- LIVE_SYMLINKS="disabled"
- fi
+ LIVE_SYMLINKS="${LIVE_SYMLINKS:-disabled}"
# Setting sysvinit option
- if [ -z "${LIVE_SYSVINIT}" ]
- then
- LIVE_SYSVINIT="disabled"
- fi
+ LIVE_SYSVINIT="${LIVE_SYSVINIT:-disabled}"
## config/binary
# Setting image type
- if [ -z "${LIVE_BINARY_IMAGES}" ]
- then
- LIVE_BINARY_IMAGES="iso"
- fi
+ LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES:-iso}"
# Setting apt indices
- if [ -z "${LIVE_BINARY_INDICES}" ]
- then
- LIVE_BINARY_INDICES="enabled"
- fi
+ LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES:-enabled}"
# Setting boot parameters
# LIVE_BOOTAPPEND
@@ -562,10 +491,7 @@ Set_defaults ()
fi
# Setting debian-installer option
- if [ -z "${LIVE_DEBIAN_INSTALLER}" ]
- then
- LIVE_DEBIAN_INSTALLER="disabled"
- fi
+ LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
# Setting encryption
# LIVE_ENCRYPTION
@@ -602,16 +528,10 @@ Set_defaults ()
fi
# Set iso preparer
- if [ -z "${LIVE_ISO_PREPARER}" ]
- then
- LIVE_ISO_PREPARER="live-helper \${VERSION}; http://packages.qa.debian.org/live-helper"
- fi
+ LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER:-live-helper ${VERSION}; http://packages.qa.debian.org/live-helper}"
# Set iso publisher
- if [ -z "${LIVE_ISO_PUBLISHER}" ]
- then
- LIVE_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org"
- fi
+ LIVE_ISO_PUBLISHER="${LIVE_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}" ]
@@ -628,10 +548,7 @@ Set_defaults ()
fi
# Setting memtest option
- if [ -z "${LIVE_MEMTEST}" ]
- then
- LIVE_MEMTEST="memtest86+"
- fi
+ LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}"
# Setting netboot server path
if [ -z "${LIVE_NET_PATH}" ]
@@ -648,31 +565,19 @@ Set_defaults ()
fi
# Setting netboot server address
- if [ -z "${LIVE_NET_SERVER}" ]
- then
- LIVE_NET_SERVER="192.168.1.1"
- fi
+ LIVE_NET_SERVER="${LIVE_NET_SERVER:-192.168.1.1}"
# Setting syslinux splash
# LIVE_SYSLINUX_SPLASH
# Setting username
- if [ -z "${LIVE_USERNAME}" ]
- then
- LIVE_USERNAME="user"
- fi
+ LIVE_USERNAME="${LIVE_USERNAME:-user}"
## config/source
# Setting source option
- if [ -z "${LIVE_SOURCE}" ]
- then
- LIVE_SOURCE="disabled"
- fi
+ LIVE_SOURCE="${LIVE_SOURCE:-disabled}"
# Setting image type
- if [ -z "${LIVE_SOURCE_IMAGES}" ]
- then
- LIVE_SOURCE_IMAGES="generic"
- fi
+ LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-generic}"
}
diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index efb478a..e80bf41 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -27,10 +27,7 @@ Create_lockfile ()
DIRECTORY="`dirname ${1}`"
# Creating lock directory
- if [ ! -d "${DIRECTORY}" ]
- then
- mkdir -p "${DIRECTORY}"
- fi
+ mkdir -p "${DIRECTORY}"
# Creating lock trap
trap "test -f ${FILE} && rm -f ${FILE}; exit 0" 0 1 2 3 9 15
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index b4938cc..2606983 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -36,10 +36,7 @@ Create_stagefile ()
DIRECTORY="`dirname ${1}`"
# Creating stage directory
- if [ ! -d "${DIRECTORY}" ]
- then
- mkdir -p "${DIRECTORY}"
- fi
+ mkdir -p "${DIRECTORY}"
# Creating stage file
touch "${FILE}"
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 45c405a..0ebb1d7 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -9,22 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build binary images"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-Breakpoint "binary: Init"
-
# Preparing root filesystem
lh_binary_chroot ${*}
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index b92f94a..4c81a30 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="copy chroot into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,8 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_chroot: Init"
+Echo_message "Begin copying chroot..."
+Echo_message "This may take a while."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -62,7 +63,6 @@ ${LH_ROOT_COMMAND} rm -rf chroot/chroot
${LH_ROOT_COMMAND} rm -rf chroot.tmp
# Copying new chroot
-Echo_message "Copying chroot, this can take a while."
${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index a14beda..99227c0 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install debian-installer into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_debian-installer: Init"
+Echo_message "Begin installing debian-installer..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index f055a07..1a9265a 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="encrypts rootfs"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_encryption: Init"
+Echo_message "Begin encrypting root filesystem image..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index c72b0f0..9300642 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="installs grub into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_grub: Init"
+Echo_message "Begin installing grub..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -125,10 +125,7 @@ then
fi
# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
- mkdir -p "${DESTDIR_LIVE}"
-fi
+mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LIVE_ENCRYPTION}" ]
diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_hdd
index 8841d15..40762e8 100755
--- a/helpers/lh_binary_hdd
+++ b/helpers/lh_binary_hdd
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build harddisk binary image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,34 +32,29 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
+then
+ exit 0
+fi
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
- if [ "${IMAGE}" = "hdd" ]
- then
- Breakpoint "binary_hdd: Init"
+Echo_message "Begin building binary harddisk image..."
- # Requiring stage file
- Require_stagefile .stage/bootstrap
+# Requiring stage file
+Require_stagefile .stage/bootstrap
- # Checking stage file
- Check_stagefile .stage/binary_hdd
+# Checking stage file
+Check_stagefile .stage/binary_hdd
- # Checking lock file
- Check_lockfile .lock
+# Checking lock file
+Check_lockfile .lock
- # Creating lock file
- Create_lockfile .lock
+# Creating lock file
+Create_lockfile .lock
- # Remove old binary
- if [ -f binary-hdd.tar.gz ]
- then
- rm -f binary-hdd.tar.gz
- fi
+# Remove old binary
+rm -f binary-hdd.tar.gz
- tar cfz binary-hdd.tar.gz binary
+tar cfz binary-hdd.tar.gz binary
- # Creating stage file
- Create_stagefile .stage/binary_hdd
- fi
-done
+# Creating stage file
+Create_stagefile .stage/binary_hdd
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 6a1f5b3..7979dfe 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="copy files into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_includes: Init"
+Echo_message "Begin copying binary includes..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 0bea7e3..1b60024 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build iso binary image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,109 +32,108 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
- if [ "${IMAGE}" = "iso" ]
- then
- Breakpoint "binary_iso: Init"
-
- # Requiring stage file
- Require_stagefile .stage/bootstrap
-
- # Checking stage file
- Check_stagefile .stage/binary_iso
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Checking depends
- Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
-
- # Installing depends
- Install_package
-
- # Remove old iso image
- if [ -f binary.iso ]
- then
- rm -f binary.iso
- fi
-
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
- fi
-
- if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
- fi
-
- if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
- fi
-
- if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
- fi
-
- if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
- fi
-
- # Moving image
- mv binary chroot
-
- # Create image
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
- then
- case "${LIVE_BOOTLOADER}" in
- grub)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
-
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
- fi
- ;;
-
- syslinux)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
- fi
- ;;
-
- *)
- Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
- sleep 5
- ;;
- esac
-
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
- fi
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f binary.iso ]
+then
+ rm -f binary.iso
+fi
+
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
+
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv binary chroot
+
+# Create image
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
+then
+ case "${LIVE_BOOTLOADER}" in
+ grub)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+ fi
+ ;;
+
+ syslinux)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+ fi
+ ;;
+
+ *)
+ Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+ sleep 5
+ ;;
+ esac
+
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+fi
cat >> chroot/binary.sh << EOF
${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
EOF
- Chroot "sh binary.sh"
+Chroot "sh binary.sh"
- # Move image
- mv chroot/binary chroot/binary.iso ./
- rm -f chroot/binary.sh
+# Move image
+mv chroot/binary chroot/binary.iso ./
+rm -f chroot/binary.sh
- # Removing depends
- Remove_package
+# Removing depends
+Remove_package
- # Creating stage file
- Create_stagefile .stage/binary_iso
- fi
-done
+# Creating stage file
+Create_stagefile .stage/binary_iso
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index b7349d9..474cf78 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install linux-image into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_linux-image: Init"
+Echo_message "Begin install linux-image..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -98,10 +98,7 @@ then
fi
# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
+mkdir -p "${DESTDIR}"
# Installing linux-image
cp chroot/boot/vmlinuz* "${DESTDIR}"
diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes
index 8b6e5aa..862aea4 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="copy files into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_local-includes: Init"
+Echo_message "Begin copying binary local includes..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/binary_local-includes/* &> /dev/null
+if ls config/binary_local-includes/* > /dev/null 2>&1
then
# Copying includes
cd config/binary_local-includes
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index 87883c3..0016f19 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="create manifest"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_manifest: Init"
+Echo_message "Begin creating manifest..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index e044406..861bce0 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="create binary md5sums"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_md5sum: Init"
+Echo_message "Begin creating binary md5sum.txt..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index a96dbc5..85f93e2 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="installs a memtest into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_memtest: Init"
+Echo_message "Begin installing memtest..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -116,10 +116,7 @@ then
fi
# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
+mkdir -p "${DESTDIR}"
# Installing memtest
case "${LIVE_MEMTEST}" in
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 6ebe7ea..0347663 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build netboot binary image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,51 +32,50 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_net: Init"
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
+then
+ exit 0
+fi
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
- if [ "${IMAGE}" = "net" ]
- then
- # Requiring stage file
- Require_stagefile .stage/bootstrap
+Echo_message "Begin building binary netboot image..."
- # Checking stage file
- Check_stagefile .stage/binary_net
+# Requiring stage file
+Require_stagefile .stage/bootstrap
- # Checking lock file
- Check_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/binary_net
- # Creating lock file
- Create_lockfile .lock
+# Checking lock file
+Check_lockfile .lock
- # Remove old binary
- if [ -f binary-net.tar.gz ]
- then
- rm -f binary-net.tar.gz
- fi
+# Creating lock file
+Create_lockfile .lock
- # Creating image file
- if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
- then
- mv chroot chroot.tmp
- fi
+# Remove old binary
+if [ -f binary-net.tar.gz ]
+then
+ rm -f binary-net.tar.gz
+fi
- mv binary "`basename ${LIVE_NET_PATH}`"
+# Creating image file
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+ mv chroot chroot.tmp
+fi
- cd ..
- tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
- mv binary-net.tar.gz "${OLDPWD}"
- cd "${OLDPWD}"
+mv binary "`basename ${LIVE_NET_PATH}`"
- mv "`basename ${LIVE_NET_PATH}`" binary
+cd ..
+tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+mv binary-net.tar.gz "${OLDPWD}"
+cd "${OLDPWD}"
- if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
- then
- mv chroot.tmp chroot
- fi
+mv "`basename ${LIVE_NET_PATH}`" binary
- # Creating stage file
- Create_stagefile .stage/binary_net
- fi
-done
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+ mv chroot.tmp chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_net
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 47529a2..359151f 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build rootfs image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_rootfs: Init"
+Echo_message "Begin building root filesystem image..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -58,10 +58,7 @@ case "${LH_INITRAMFS}" in
esac
# Creating directory
-if [ ! -d binary/${INITFS} ]
-then
- mkdir -p binary/${INITFS}
-fi
+mkdir -p binary/${INITFS}
case "${LIVE_CHROOT_FILESYSTEM}" in
ext2)
@@ -127,12 +124,18 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
fi
+ if [ -f config/binary_rootfs/squashfs.sort ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
+ cp config/binary_rootfs/squashfs.sort chroot
+ fi
+
# Create image
Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
# Move image
${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
- ${LH_ROOT_COMMAND} rm -rf chroot/chroot
+ ${LH_ROOT_COMMAND} rm -rf chroot/chroot chroot/squashfs.sort
if [ -n "${LH_ROOT_COMMAND}" ]
then
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 124cb36..869bcc1 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="installs syslinux into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_syslinux: Init"
+Echo_message "Begin installing syslinux..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -137,10 +137,7 @@ then
fi
# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
- mkdir -p "${DESTDIR_LIVE}"
-fi
+mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LIVE_ENCRYPTION}" ]
@@ -174,7 +171,7 @@ then
live-initramfs)
if [ "${LIVE_HOSTNAME}" != "debian" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
fi
;;
esac
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 5185a95..49f8e8e 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_binary_usb-hdd(1) - build binary image
+# lh_binary_usb-hdd(1) - build binary usb-hdd image
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build binary image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,127 +32,126 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_usb-hdd: Init"
-
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
- if [ "${IMAGE}" = "usb-hdd" ]
- then
- # Requiring stage file
- Require_stagefile .stage/bootstrap
- Require_stagefile .stage/chroot_proc
-
- # Checking stage file
- Check_stagefile .stage/binary_usb-hdd
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Checking depends
- Check_package chroot/sbin/mkdosfs dosfstools
- Check_package chroot/usr/sbin/mtools mtools
- Check_package chroot/sbin/parted parted
-
- case "${LIVE_BOOTLOADER}" in
- grub)
- Check_package chroot/usr/sbin/grub grub
- ;;
-
- syslinux)
- Check_package chroot/usr/bin/syslinux syslinux
- ;;
- esac
-
- # Installing depends
- Install_package
-
- # Remove old binary
- if [ -f binary.img ]
- then
- rm -f binary.img
- fi
-
- # Everything which comes here needs to be cleaned up,
- DU_DIM="`du -ms binary | cut -f1`"
- REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
- dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
- FREELO="`${LH_LOSETUP} -f`"
- if [ ! -b chroot/${FREELO} ]
- then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
- fi
-
- echo "!!! The following error/warning messages can be ignored !!!"
- lh_losetup $FREELO binary.img 0
- 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
-
- case "${LIVE_BOOTLOADER}" in
- grub)
- #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary usb-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/chroot_proc
+
+# Checking stage file
+Check_stagefile .stage/binary_usb-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/usr/sbin/mtools mtools
+Check_package chroot/sbin/parted parted
+
+case "${LIVE_BOOTLOADER}" in
+ grub)
+ Check_package chroot/usr/sbin/grub grub
+ ;;
+
+ syslinux)
+ Check_package chroot/usr/bin/syslinux syslinux
+ ;;
+esac
+
+# Installing depends
+Install_package
+
+# Remove old binary
+if [ -f binary.img ]
+then
+ rm -f binary.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms binary | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO binary.img 0
+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
+
+case "${LIVE_BOOTLOADER}" in
+ grub)
+ #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
#
#quit
#EOF
- #rm -f binary/boot/grub/device.map
-
- #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
- ;;
-
- syslinux)
- cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
- ;;
- esac
-
- ${LH_LOSETUP} -d ${FREELO}
-
- FREELO="`${LH_LOSETUP} -f`"
- lh_losetup $FREELO binary.img 1
- Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
- mkdir -p binary.tmp
- ${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
- cp -r binary/* binary.tmp
- ${LH_ROOT_COMMAND} umount binary.tmp
- rmdir binary.tmp
-
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- Chroot "syslinux ${FREELO}"
- fi
-
- ${LH_LOSETUP} -d ${FREELO}
-
- #if [ "${LIVE_BOOTLOADER}" = "grub" ]
- #then
- # FREELO="`${LH_LOSETUP} -f`"
- # lh_losetup $FREELO binary.img 0
-
- # dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
- # dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
-
- # ${LH_LOSETUP} -d ${FREELO}
- #fi
- echo "!!! The above error/warning messages can be ignored !!!"
-
- if [ -n "${MAKEDEV}" ]
- then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
- fi
-
- # Removing depends
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/binary_usb-hdd
- fi
-done
+ #rm -f binary/boot/grub/device.map
+
+ #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
+ ;;
+
+ syslinux)
+ cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+ ;;
+esac
+
+${LH_LOSETUP} -d ${FREELO}
+
+FREELO="`${LH_LOSETUP} -f`"
+lh_losetup $FREELO binary.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p binary.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
+cp -r binary/* binary.tmp
+${LH_ROOT_COMMAND} umount binary.tmp
+rmdir binary.tmp
+
+if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+then
+ Chroot "syslinux ${FREELO}"
+fi
+
+${LH_LOSETUP} -d ${FREELO}
+
+#if [ "${LIVE_BOOTLOADER}" = "grub" ]
+#then
+# FREELO="`${LH_LOSETUP} -f`"
+# lh_losetup $FREELO binary.img 0
+
+# dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
+# dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
+
+# ${LH_LOSETUP} -d ${FREELO}
+#fi
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_usb-hdd
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index 23187f3..0b0becf 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="installs yaboot into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_yaboot: Init"
+Echo_message "Begin installing yaboot..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -113,10 +113,7 @@ then
fi
# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
+mkdir -p "${DESTDIR}"
# Setting boot parameters
if [ -n "${LIVE_ENCRYPTION}" ]
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index 36a7a0a..fbb8f17 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -9,26 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="bootstrap a Debian system"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
-# Starting helper
-Echo_debug "Init ${PROGRAM}"
-
-Breakpoint "bootstrap: Init"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index dad8948..2eaa23f 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -9,24 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="bootstrap a Debian system with cdebootstrap(1)"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-# Ensure that a system is built as root
-lh_testroot
-
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -35,13 +32,16 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "bootstrap_cdeboostrap: Init"
-
if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
then
exit 0
fi
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
# Checking stage file
Check_stagefile .stage/bootstrap
@@ -52,10 +52,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Creating chroot directory
-if [ ! -d chroot ]
-then
- mkdir -p chroot
-fi
+mkdir -p chroot
# Setting cdebootstrap options
if [ -n "${LIVE_ARCHITECTURE}" ]
@@ -68,6 +65,11 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
fi
+if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
+fi
+
if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
@@ -134,10 +136,7 @@ then
fi
# Saving new cache
- if [ ! -d cache/packages_bootstrap ]
- then
- mkdir -p cache/packages_bootstrap
- fi
+ mkdir -p cache/packages_bootstrap
cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
fi
@@ -174,10 +173,7 @@ then
rm -rf cache/stages_bootstrap
fi
- if [ ! -d cache ]
- then
- mkdir cache
- fi
+ mkdir -p cache
${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index c3e4cad..58d36c4 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -9,24 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="bootstrap a Debian system with debootstrap(8)"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-# Ensure that a system is built as root
-lh_testroot
-
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -35,13 +32,16 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "bootstrap_debootstrap: Init"
-
if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
then
exit 0
fi
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
# Checking stage file
Check_stagefile .stage/bootstrap
@@ -52,10 +52,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Creating chroot directory
-if [ ! -d chroot ]
-then
- mkdir -p chroot
-fi
+mkdir -p chroot
# Setting debootstrap options
if [ -n "${LIVE_ARCHITECTURE}" ]
@@ -117,10 +114,7 @@ then
fi
# Saving new cache
- if [ ! -d cache/packages_bootstrap ]
- then
- mkdir -p cache/packages_bootstrap
- fi
+ mkdir -p cache/packages_bootstrap
cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
fi
@@ -146,10 +140,7 @@ then
rm -rf cache/stages_bootstrap
fi
- if [ ! -d cache ]
- then
- mkdir cache
- fi
+ mkdir -p cache
${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
diff --git a/helpers/lh_build b/helpers/lh_build
index e2cef4c..3e8e782 100755
--- a/helpers/lh_build
+++ b/helpers/lh_build
@@ -9,30 +9,29 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build a Debian Live system"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-Breakpoint "build: Init"
-
# Bootstrapping system
lh_bootstrap ${*}
# Customizing chroot
lh_chroot ${*}
-# Building binary image
+# Building binary images
lh_binary ${*}
-# Building source image
+# Building source images
lh_source ${*}
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 7c0015e..b12521f 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="customize the Debian system"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,8 +32,6 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot: Init"
-
# Configuring chroot
lh_chroot_proc install ${*}
lh_chroot_sysfs install ${*}
@@ -46,6 +44,7 @@ lh_chroot_sources install ${*}
lh_chroot_linux-image install ${*}
# Customizing chroot
+lh_chroot_preseed ${*}
lh_chroot_tasks ${*}
lh_chroot_packageslists ${*}
lh_chroot_packages ${*}
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 97d7087..cafabd3 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /etc/apt/apt.conf"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_apt: Init"
+Echo_message "Configuring file /etc/apt/apt.conf"
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -48,10 +48,7 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ ! -d chroot/etc/apt/apt.conf.d ]
- then
- mkdir -p chroot/etc/apt/apt.conf.d
- fi
+ mkdir -p chroot/etc/apt/apt.conf.d
# Configuring apt ftp proxy
if [ -n "${LH_APT_FTPPROXY}" ]
@@ -76,6 +73,12 @@ case "${1}" in
;;
esac
+ # Configuring apt pipeline
+ if [ -n "${LH_APT_PIPELINE}" ]
+ then
+ echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+ fi
+
# Configuring apt recommends
if [ "${LH_APT}" = "aptitude" ]
then
@@ -123,6 +126,9 @@ case "${1}" in
# Deconfiguring aptitude pdiffs
rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+ # Deconfiguring aptitude pipeline
+ rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
# Deconfiguring aptitude recommends
rm -f chroot/etc/apt/apt.conf.d/00recommends
diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot
index 3c65f53..4410227 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /etc/debian_chroot"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_debianchroot: Init"
+Echo_message "Configuring file /etc/debian_chroot"
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 1c828dc..5a5e650 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="execute hacks in chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_hacks: Init"
+Echo_message "Begin executing hacks..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 8f5c988..caa4fd3 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="execute hooks in chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_hooks: Init"
+Echo_message "Begin executing hooks..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -49,10 +49,10 @@ Create_lockfile .lock
# Processing hooks
for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
do
- if [ -f /usr/share/live-helper/hooks/"${HOOK}" ]
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
then
# Copying hook
- cp /usr/share/live-helper/hooks/"${HOOK}" chroot/root
+ cp ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
# Making hook executable
if [ ! -x chroot/root/"${HOOK}" ]
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 3a7dec9..09ae098 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /etc/hosts"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_hosts: Init"
+Echo_message "Configuring file /etc/hosts"
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index e8c5773..2a9417e 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="make build interactive"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_interactive: Init"
-
if [ "${LIVE_INTERACTIVE}" = "disabled" ]
then
exit 0
fi
+Echo_message "Begin interactive build..."
+
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 660ae40..218f248 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /etc/kernel-img.conf"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_linux-image: Init"
+Echo_message "Configuring file /etc/kernel-img.conf"
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks
index 953a1f1..75702db 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="execute local hooks in chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_local-hooks: Init"
+Echo_message "Begin executing local hooks..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -47,7 +47,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing local-hooks
-if ls config/chroot_local-hooks/* &> /dev/null
+if ls config/chroot_local-hooks/* > /dev/null 2>&1
then
for HOOK in config/chroot_local-hooks/*
do
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index 0d94703..329c566 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="copy local files into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_local-includes: Init"
+Echo_message "Begin copying chroot local includes..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_local-includes/* &> /dev/null
+if ls config/chroot_local-includes/* > /dev/null 2>&1
then
# Copying includes
cd config/chroot_local-includes
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 07c9eb2..fd42695 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install local packages into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_local-packages: Init"
+Echo_message "Begin installing local packages..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_local-packages/*.deb &> /dev/null
+if ls config/chroot_local-packages/*.deb > /dev/null 2>&1
then
# Restoring cache
Restore_cache cache/packages_local-packages
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists
index f358fca..ed914ab 100755
--- a/helpers/lh_chroot_local-packageslists
+++ b/helpers/lh_chroot_local-packageslists
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install local packages into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_local-packageslists: Init"
+Echo_message "Begin installing local packages lists..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_local-packageslists/* &> /dev/null
+if ls config/chroot_local-packageslists/* > /dev/null 2>&1
then
# Restoring cache
Restore_cache cache/packages_local-packageslists
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 914be81..1741b58 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install localization packages into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_localization: Init"
+Echo_message "Begin installing localization packages..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -601,35 +601,12 @@ then
esac
# Setting languages
- if [ -z "${ICEAPE}" ]
- then
- ICEAPE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${ICEDOCE}" ]
- then
- ICEDOVE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${ICEWEASEL}" ]
- then
- ICEWEASEL="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${KDE}" ]
- then
- KDE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${KOFFICE}" ]
- then
- KOFFICE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${OPENOFFICE}" ]
- then
- OPENOFFICE="${LIVE_LANGUAGE}"
- fi
+ ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
+ ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
+ ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
+ KDE="${KDE:-$LIVE_LANGUAGE}"
+ KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
+ OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
# Setting packages
for LOCALIZATION in ${LOCALIZATIONS}
diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index e94cdda..bfc427c 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install packages into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_packages: Init"
+Echo_message "Begin installing packages..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index d1d9a13..3735d6b 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install packages lists into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_packageslists: Init"
+Echo_message "Begin installing packages lists..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -53,10 +53,10 @@ then
for LIST in ${LIVE_PACKAGES_LISTS}
do
- if [ -f /usr/share/live-helper/lists/"${LIST}" ]
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
then
# Copying package list
- grep -v "^#" /usr/share/live-helper/lists/"${LIST}" > chroot/root/"${LIST}"
+ grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
# Installing package list
case "${LH_APT}" in
diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed
new file mode 100755
index 0000000..88f9dd3
--- /dev/null
+++ b/helpers/lh_chroot_preseed
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# lh_chroot_preseed(1) - mount /proc
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute preseed in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing preseed..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PRESEED}" ]
+then
+ if [ -f "${LIVE_PRESEED}" ]
+ then
+ # Check dependency
+ Check_package chroot/usr/bin/debconf-set-selections debconf
+
+ # Install dependency
+ Install_package
+
+ # Copying preseed
+ cp "${LIVE_PRESEED}" chroot/root/preseed
+
+ Chroot "debconf-set-selections /root/preseed"
+
+ # Removing preseed file
+ rm -f chroot/root/preseed
+
+ # Remove dependency
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_preseed
+ fi
+else
+ Echo_error "'${LIVE_PRESEED}' file doesn't exists."
+ exit 1
+fi
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 563dbb4..66b4c3c 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -9,13 +9,15 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="mount /proc"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
@@ -25,8 +27,6 @@ Arguments "${@}"
# Ensure that a system is built as root
lh_testroot
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -35,7 +35,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_proc: Init"
+Echo_message "Begin mounting /proc..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -51,11 +51,8 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ ! -d chroot/proc ]
- then
- # Creating mountpoint
- mkdir -p chroot/proc
- fi
+ # Creating mountpoint
+ mkdir -p chroot/proc
# Mounting /proc
${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index 8197b8a..031bdc2 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /etc/resolv.conf"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_resolv: Init"
+Echo_message "Configuring file /etc/resolv.conf"
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index bdbe856..341f2d6 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /etc/apt/sources.list"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_sources: Init"
+Echo_message "Configuring file /etc/apt/sources.list"
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -83,7 +83,7 @@ case "${1}" in
fi
# Check local sources.list
- if ls config/chroot_sources/*.bootstrap &> /dev/null
+ if ls config/chroot_sources/*.bootstrap > /dev/null 2>&1
then
echo "" >> chroot/etc/apt/sources.list
echo "# Custom repositories" >> chroot/etc/apt/sources.list
@@ -97,12 +97,12 @@ case "${1}" in
# Update indices from cache
if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
then
- if ls cache/indices_bootstrap/secring.gpg* &> /dev/null
+ if ls cache/indices_bootstrap/secring.gpg* > /dev/null 2>&1
then
cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
fi
- if ls cache/indices_bootstrap/trusted.gpg* &> /dev/null
+ if ls cache/indices_bootstrap/trusted.gpg* > /dev/null 2>&1
then
cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
fi
@@ -117,17 +117,17 @@ case "${1}" in
cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
fi
- if ls cache/indices_bootstrap/*_Packages &> /dev/null
+ if ls cache/indices_bootstrap/*_Packages > /dev/null 2>&1
then
cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
fi
- if ls cache/indices_bootstrap/*_Sources &> /dev/null
+ if ls cache/indices_bootstrap/*_Sources > /dev/null 2>&1
then
cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
fi
- if ls cache/indices_bootstrap/*_Release* &> /dev/null
+ if ls cache/indices_bootstrap/*_Release* > /dev/null 2>&1
then
cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
fi
@@ -138,7 +138,7 @@ case "${1}" in
fi
else # Get fresh indices
# Check local gpg keys
- if ls config/chroot_sources/*.bootstrap.gpg &> /dev/null
+ if ls config/chroot_sources/*.bootstrap.gpg > /dev/null 2>&1
then
for FILE in config/chroot_sources/*.bootstrap.gpg
do
@@ -149,7 +149,7 @@ case "${1}" in
fi
# Check local keyring packages
- if ls config/chroot_sources/*.deb &> /dev/null
+ if ls config/chroot_sources/*.deb > /dev/null 2>&1
then
for PACKAGE in config/chroot_sources/*.deb
do
@@ -183,10 +183,7 @@ case "${1}" in
if [ "${LH_CACHE_INDICES}" = "enabled" ]
then
- if [ ! -d cache/indices_bootstrap ]
- then
- mkdir -p cache/indices_bootstrap
- fi
+ mkdir -p cache/indices_bootstrap
cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
@@ -259,7 +256,7 @@ case "${1}" in
fi
# Check local sources.list
- if ls config/chroot_sources/*.binary &> /dev/null
+ if ls config/chroot_sources/*.binary > /dev/null 2>&1
then
echo "" >> chroot/etc/apt/sources.list
echo "# Custom repositories" >> chroot/etc/apt/sources.list
@@ -271,7 +268,7 @@ case "${1}" in
fi
# Check local gpg keys
- if ls config/chroot_sources/*.binary.gpg &> /dev/null
+ if ls config/chroot_sources/*.binary.gpg > /dev/null 2>&1
then
for FILE in config/chroot_sources/*.binary.gpg
do
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index 2f89d41..a7ceefe 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="convert symlinks"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,12 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_symlinks: Init"
+if [ "${LIVE_SYMLINKS}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin converting symlinks..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -46,20 +51,17 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LIVE_SYMLINKS}" = "enabled" ]
-then
- # Checking depends
- Check_package chroot/usr/bin/symlinks symlinks
+# Checking depends
+Check_package chroot/usr/bin/symlinks symlinks
- # Installing depends
- Install_package
+# Installing depends
+Install_package
- # Converting symlinks
- Chroot "symlinks -c -r -s /"
+# Converting symlinks
+Chroot "symlinks -c -r -s /"
- # Removing depends
- Remove_package
+# Removing depends
+Remove_package
- # Creating stage file
- Create_stagefile .stage/chroot_symlinks
-fi
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index 244369c..996262d 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -9,13 +9,15 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="mount /sys"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
@@ -25,8 +27,6 @@ Arguments "${@}"
# Ensure that a system is built as root
lh_testroot
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -35,7 +35,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_sysfs: Init"
+Echo_message "Begin mounting /sys..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -51,11 +51,8 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ ! -d chroot/sys ]
- then
- # Create mountpoint
- mkdir -p chroot/sys
- fi
+ # Create mountpoint
+ mkdir -p chroot/sys
# Mounting /sys
${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index 16f40f1..ca45aff 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="configure sysvinit"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_sysvinit: Init"
+Echo_message "Configuring package sysvinit"
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_sysvrc b/helpers/lh_chroot_sysvrc
index 1729f46..a2b2230 100755
--- a/helpers/lh_chroot_sysvrc
+++ b/helpers/lh_chroot_sysvrc
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="manage /usr/sbin/policy-rc.d"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_sysvrc: Init"
+Echo_message "Configuring file /usr/sbin/policy-rc.d"
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 9b6da5b..704f3d4 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="install tasks into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_tasks: Init"
+Echo_message "Begin installing tasks..."
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_clean b/helpers/lh_clean
index f016e95..84c60b8 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="clean up system build directories"
HELP=""
USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
diff --git a/helpers/lh_config b/helpers/lh_config
index 7020536..b911207 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -9,13 +9,15 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="create configuration for live-helper(7)"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -24,19 +26,17 @@ Arguments "${@}"
CONFIG="${1}"
-Echo_debug "Init ${PROGRAM}"
-
if [ -n "${LH_CONFIG}" ]
then
- if [ -d /usr/share/live-helper/configs/"${LH_CONFIG}" ]
+ if [ -d ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
then
mkdir "${LH_CONFIG}"
- cp -r /usr/share/live-helper/configs/"${LH_CONFIG}" "${LH_CONFIG}"/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 /usr/share/live-helper/configs/."
+ Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE:-/usr/share/live-helper}/configs/."
fi
fi
@@ -53,8 +53,6 @@ fi
# Setting defaults
Set_defaults
-Breakpoint "config: Init"
-
# Creating bootstrap configuration
mkdir -p "${LIVE_ROOT}"/config
mkdir -p "${LIVE_ROOT}"/config/includes
@@ -80,6 +78,10 @@ LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
# (Default: ${LH_APT_PDIFFS})
LH_APT_PDIFFS="${LH_APT_PDIFFS}"
+# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LH_APT_PIPELINE})
+LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+
# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
# (Default: ${LH_APT_RECOMMENDS})
LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
@@ -183,18 +185,22 @@ cat > "${LIVE_ROOT}"/config/bootstrap << EOF
# (Default: autodetected)
LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
-# \$LIVE_DISTRIBUTION: select distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory
+# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
# (Default: empty)
-LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
+LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+
+# \$LIVE_DISTRIBUTION: select distribution to use
+# (Default: ${LIVE_DISTRIBUTION})
+LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
+
# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
# (Default: ${LIVE_MIRROR_BOOTSTRAP})
LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
@@ -282,6 +288,7 @@ EOF
# Creating lh_binary_* configuration
mkdir -p "${LIVE_ROOT}"/config/binary_grub
mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
cat > "${LIVE_ROOT}"/config/binary << EOF
diff --git a/helpers/lh_losetup b/helpers/lh_losetup
index a8d6176..c2c7a7b 100755
--- a/helpers/lh_losetup
+++ b/helpers/lh_losetup
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="wrapper around losetup"
HELP=""
USAGE="${PROGRAM} <device> <file> <partition>"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,8 +32,6 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "losetup: Init"
-
if [ -z "${1}" ]
then
DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
diff --git a/helpers/lh_source b/helpers/lh_source
index 56c1849..bf07772 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build source images"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,8 +32,6 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source: Init"
-
# Enabling network in chroot
lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*}
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index eb43e18..4ec0a56 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="debian sources"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_debian: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
+Echo_message "Begin downloading sources..."
+
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live
index 06f9d86..970e0fd 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="copy debian-live config into source"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_debian-live: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
+Echo_message "Begin copying live-helper configuration..."
+
# Requiring stage file
Require_stagefile .stage/bootstrap
diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic
index 4db80a0..7c1b826 100755
--- a/helpers/lh_source_generic
+++ b/helpers/lh_source_generic
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build source generic image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,40 +32,39 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_generic: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
- if [ "${IMAGE}" = "generic" ]
- then
- # Requiring stage file
- Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic
+then
+ exit 0
+fi
- # Checking stage file
- Check_stagefile .stage/source_generic
+Echo_message "Begin building source generic image..."
+Echo_message "This may take a while."
- # Checking lock file
- Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
- # Creating lock file
- Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_generic
- # Remove old source
- if [ -f source.tar ]
- then
- rm -f source.tar
- fi
+# Checking lock file
+Check_lockfile .lock
- # Create tarball
- Echo_message "Creating tarball, this can take a while."
- tar cf source.tar source
+# Creating lock file
+Create_lockfile .lock
- # Creating stage file
- Create_stagefile .stage/source_generic
- fi
-done
+# Remove old source
+if [ -f source.tar ]
+then
+ rm -f source.tar
+fi
+
+# Create tarball
+tar cf source.tar source
+
+# Creating stage file
+Create_stagefile .stage/source_generic
diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd
index 74b8889..416f1ba 100755
--- a/helpers/lh_source_hdd
+++ b/helpers/lh_source_hdd
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build source harddisk image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,40 +32,39 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_hdd: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
- if [ "${IMAGE}" = "hdd" ]
- then
- # Requiring stage file
- Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
+then
+ exit 0
+fi
- # Checking stage file
- Check_stagefile .stage/source_hdd
+Echo_message "Begin building source harddisk image..."
+Echo_message "This may take a while."
- # Checking lock file
- Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
- # Creating lock file
- Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_hdd
- # Remove old source
- if [ -f source-hdd.tar.gz ]
- then
- rm -f source-hdd.tar.gz
- fi
+# Checking lock file
+Check_lockfile .lock
- # Create tarball
- Echo_message "Creating tarball, this can take a while."
- tar cfz source-hdd.tar.gz source
+# Creating lock file
+Create_lockfile .lock
- # Creating stage file
- Create_stagefile .stage/source_hdd
- fi
-done
+# Remove old source
+if [ -f source-hdd.tar.gz ]
+then
+ rm -f source-hdd.tar.gz
+fi
+
+# Create tarball
+tar cfz source-hdd.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_hdd
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index 426fac7..79e588e 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build iso source image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,78 +37,77 @@ then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
- if [ "${IMAGE}" = "iso" ]
- then
- Breakpoint "source_iso: Init"
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
+then
+ exit 0
+fi
- # Requiring stage file
- Require_stagefile .stage/source_debian
+Echo_message "Begin building source iso image..."
- # Checking stage file
- Check_stagefile .stage/source_iso
+# Requiring stage file
+Require_stagefile .stage/source_debian
- # Checking lock file
- Check_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_iso
- # Creating lock file
- Create_lockfile .lock
+# Checking lock file
+Check_lockfile .lock
- # Checking depends
- Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+# Creating lock file
+Create_lockfile .lock
- # Installing depends
- Install_package
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
- # Remove old iso image
- if [ -f source.iso ]
- then
- rm -f source.iso
- fi
+# Installing depends
+Install_package
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
- fi
+# Remove old iso image
+if [ -f source.iso ]
+then
+ rm -f source.iso
+fi
- if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
- fi
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
- if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
- fi
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
- if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
- fi
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
- if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
- fi
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
- # Moving image
- mv source chroot
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv source chroot
cat >> chroot/source.sh << EOF
${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
EOF
- Chroot "sh source.sh"
+Chroot "sh source.sh"
- # Move image
- mv chroot/source chroot/source.iso ./
- rm -f chroot/source.sh
+# Move image
+mv chroot/source chroot/source.iso ./
+rm -f chroot/source.sh
- # Removing depends
- Remove_package
+# Removing depends
+Remove_package
- # Creating stage file
- Create_stagefile .stage/source_iso
- fi
-done
+# Creating stage file
+Create_stagefile .stage/source_iso
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index e458ed8..7674692 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="create source md5sums"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_md5sum: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
+Echo_message "Begin creating source md5sum.txt..."
+
# Requiring stage file
Require_stagefile .stage/source_debian
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index 90e5191..58da2f9 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build source net image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,39 +32,38 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_net: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
- if [ "${IMAGE}" = "net" ]
- then
- # Requiring stage file
- Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
+then
+ exit 0
+fi
- # Checking stage file
- Check_stagefile .stage/source_net
+Echo_message "Begin building source netboot image..."
- # Checking lock file
- Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
- # Creating lock file
- Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_net
- # Remove old source
- if [ -f source-net.tar.gz ]
- then
- rm -f source-net.tar.gz
- fi
+# Checking lock file
+Check_lockfile .lock
- # Create tarball
- tar cfz source-net.tar.gz source
+# Creating lock file
+Create_lockfile .lock
- # Creating stage file
- Create_stagefile .stage/source_net
- fi
-done
+# Remove old source
+if [ -f source-net.tar.gz ]
+then
+ rm -f source-net.tar.gz
+fi
+
+# Create tarball
+tar cfz source-net.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_net
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index ec853a1..903f2bb 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_usb-hdd(1) - build source image
+# lh_source_usb-hdd(1) - build source usb-hdd image
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="build source image"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -32,82 +32,81 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_usb-hdd: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
- if [ "${IMAGE}" = "usb-hdd" ]
- then
- # Requiring stage file
- Require_stagefile .stage/source_debian
-
- # Checking stage file
- Check_stagefile .stage/source_usb-hdd
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Checking depends
- Check_package chroot/sbin/mkdosfs dosfstools
- Check_package chroot/sbin/parted parted
-
- # Installing depends
- Install_package
-
- # Remove old source
- if [ -f source.img ]
- then
- rm -f source.img
- fi
-
- # Everything which comes here needs to be cleaned up,
- DU_DIM="`du -ms source | cut -f1`"
- REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
- dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
- FREELO="`${LH_LOSETUP} -f`"
- if [ ! -b chroot/${FREELO} ]
- then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
- fi
-
- echo "!!! The following error/warning messages can be ignored !!!"
- lh_losetup $FREELO source.img 0
- Chroot "parted -s ${FREELO} mklabel msdos" || true
- Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
- Chroot "parted -s ${FREELO} set 1 lba off" || true
- ${LH_LOSETUP} -d ${FREELO}
-
- lh_losetup $FREELO source.img 1
- Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
- mkdir -p source.tmp
- ${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
- cp -r source/* source.tmp
- ${LH_ROOT_COMMAND} umount source.tmp
- rmdir source.tmp
- ${LH_LOSETUP} -d ${FREELO}
- echo "!!! The above error/warning messages can be ignored !!!"
-
- if [ -n "${MAKEDEV}" ]
- then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
- fi
-
- # Removing depends
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/source_usb-hdd
- fi
-done
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building source usb-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_usb-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/sbin/parted parted
+
+# Installing depends
+Install_package
+
+# Remove old source
+if [ -f source.img ]
+then
+ rm -f source.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms source | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO source.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+${LH_LOSETUP} -d ${FREELO}
+
+lh_losetup $FREELO source.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p source.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+cp -r source/* source.tmp
+${LH_ROOT_COMMAND} umount source.tmp
+rmdir source.tmp
+${LH_LOSETUP} -d ${FREELO}
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_usb-hdd
diff --git a/helpers/lh_testroot b/helpers/lh_testroot
index 679119e..90464ec 100755
--- a/helpers/lh_testroot
+++ b/helpers/lh_testroot
@@ -9,13 +9,15 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="ensure that a system is built as root"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -30,8 +32,6 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Echo_debug "Init ${PROGRAM}"
-
# Checking user account
if [ "`${LH_ROOT_COMMAND} id -u`" -ne "0" ]
then
diff --git a/helpers/make-live b/helpers/make-live
index d4ad57a..3f71f5c 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -22,13 +22,15 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# 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-flavour 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] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
@@ -39,7 +41,7 @@ Local_arguments ()
{
ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-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:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,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 [ "${?}" != "0" ]
+ if [ "${?}" -ne "0" ]
then
echo "Terminating." >&2
exit 1
@@ -355,10 +357,7 @@ Main ()
Set_defaults
- if [ -z "${ROOT}" ]
- then
- ROOT="${LIVE_ROOT}"
- fi
+ ROOT="${ROOT:-$LIVE_ROOT}"
# Source existing configuration
Read_conffile "${ROOT}"/config/common
diff --git a/includes/etch/live/boot-parameters.txt b/includes/etch/live/boot-parameters.txt
new file mode 100644
index 0000000..73e6717
--- /dev/null
+++ b/includes/etch/live/boot-parameters.txt
@@ -0,0 +1,40 @@
+Boot Parameters for Debian Live
+-------------------------------
+
+Updated for live-initramfs 1.87.6-1 on 2007-06-03.
+
+These options (can be combined) work from the ISOLINUX bootprompt:
+
+live access=v1|v2|v3|m1|m2 specify accessibility level
+live console=TTY,SPEED setting default console for live-getty
+live hostname=HOSTNAME override hostname value
+live integrity-check check media data integrity and md5sums
+live ip=IFACE,ADDRESS,NETMASK,GATEWAY specify network interface(s)
+live ip[=frommedia] skips dhcp/static, uses preconfiguration
+live keyb|kbd-chooser/method=KEYBOARD
+live klayout|console-setup/layoutcode=LAYOUT
+live kvariant|console-setup/variantcode=VARIANT
+live kmodel|console-setup/modelcode=CODE
+live koptions=OPTIONS
+live live-getty
+live live-media|bootfrom=DEVICE
+live live-media-encryption|encryption=TYPE
+live live-media-offset=BYTES
+live live-media-timeout=SECONDS
+live locale|debian-installer/local=LOCALE
+live module=NAME
+live netboot[=nfs|cifs]
+live noautologin
+live noxautologin
+live nopersistent
+live nosudo
+live noswap
+live persistent
+live quickreboot
+live showmounts
+live todisk=DEVICE
+live toram copy media to RAM and run from there
+live preseed/file|file=FILE
+live package/question=VALUE
+live xdebconf
+live xvideomode=RESOLUTION
diff --git a/lists/mini b/lists/mini
deleted file mode 100644
index 3778f14..0000000
--- a/lists/mini
+++ /dev/null
@@ -1,4 +0,0 @@
-# /usr/share/live-helper/lists/mini - package list for live-helper(7)
-
-# Minimal
-eject file sudo vim-tiny
diff --git a/lists/minimal b/lists/minimal
deleted file mode 100644
index ad2ebcf..0000000
--- a/lists/minimal
+++ /dev/null
@@ -1,4 +0,0 @@
-# /usr/share/live-helper/lists/minimal - package list for live-helper(7)
-
-# Minimal
-eject file sudo vim-tiny
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index 0207347..52f8ae9 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_BINARY 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index 69800fb..660156a 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_BINARY 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_binary \- meta\-helper for lh_binary_*
diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1
index f2f69ae..5ddeb2a 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_BOOTSTRAP 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index 285959a..f55ceb5 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_bootstrap \- meta\-helper for lh_bootstrap_*
diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1
index 5590fb7..e813e37 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index b81817d..6bcb0d9 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\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1
index cb8e00d..c3764c6 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index 70b9bb3..9731e8e 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\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1
index f4ea33f..02240df 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_BUILD 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_build \- erstellen eines Live-Systemes
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index 42306da..b88e0e0 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_BUILD 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_build \- building a live system
diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1
index 32854bf..c5d3dae 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_CHROOT 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index b423e71..f5eb11d 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_CHROOT 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_chroot \- meta\-helper for lh_chroot_*
diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1
index ddc66b6..220615e 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_CLEAN 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_clean \- r\[:a]umt das Build-Verzeichnis auf
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index 17d3180..fca8c56 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_CLEAN 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_clean \- clean up system build directories
diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1
index c3e8cfd..167c727 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_SOURCE 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_source \- Meta\-Helper f\[:u]r lh_source_*
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index a642689..6f9ef8d 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_SOURCE 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_source \- meta\-helper for lh_source_*
diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1
index f3a0eec..42770e5 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LH_TESTROOT 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
lh_testroot \- stellt sicher dass das System als root gebaut wird
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index 5488a8b..c618860 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
lh_testroot \- ensure that a system is built as root
diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7
index 8e02352..67b9ae8 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "28.05.2007" "1.0~a12" "live\-helper"
+.TH LIVE\-HELPER 7 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
live\-helper \- Debian Live Helper-Programme
@@ -167,6 +167,10 @@ gibt Versionsinformationen aus und stoppt.
.SH SIEHE AUCH
\fIlive\-initramfs\fR(7)
+.PP
+\fIlive\-sysvinit\fR(7)
+.PP
+\fIlive\-webhelper\fR(7)
.SH FEHLER
Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index 61bf5f9..641c9ee 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
live\-helper \- Debian Live helper programs
@@ -165,6 +165,10 @@ output version information and exit
.SH SEE ALSO
\fIlive\-initramfs\fR(7)
+.PP
+\fIlive\-sysvinit\fR(7)
+.PP
+\fIlive\-webhelper\fR(7)
.SH BUGS
Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1
index 21884ec..d02d098 100644
--- a/manpages/make-live.de.1
+++ b/manpages/make-live.de.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "28.05.2007" "1.0~a12" "live\-helper"
+.TH MAKE\-LIVE 1 "04.06.2007" "1.0~a13" "live\-helper"
.SH NAME
make\-live \- erstellt ein Debian Live-System
diff --git a/manpages/make-live.en.1 b/manpages/make-live.en.1
index aaf5e76..a95ce30 100644
--- a/manpages/make-live.en.1
+++ b/manpages/make-live.en.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "2007\-05\-28" "1.0~a12" "live\-helper"
+.TH MAKE\-LIVE 1 "2007\-06\-04" "1.0~a13" "live\-helper"
.SH NAME
make\-live \- build a Debian Live system
--
cgit v1.0