From d1ee66e44c8272bb7a0053a456a3d8b0bd152268 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:10 +0200
Subject: Adding live-helper 1.0~a12-1.
---
Makefile | 20 ++-
debian/changelog | 6 +
debian/cron.daily | 4 +
debian/logrotate | 11 ++
debian/postrm | 22 +++
debian/rules | 1 +
docs/CREDITS | 2 +-
docs/ChangeLog | 15 ++
docs/TODO | 7 +-
examples/cron/crontab | 8 +
examples/cron/daily.sh | 4 +
examples/cron/etch+beryl.sh | 6 +-
examples/cron/etch.sh | 6 +-
examples/cron/snapshots.sh | 6 +-
examples/cron/weekly.sh | 4 +
examples/sources.list/beryl | 14 --
examples/sources.list/debian-backports | 9 --
examples/sources.list/debian-edu | 11 --
examples/sources.list/fai | 9 --
examples/sources.list/live-backports | 11 --
examples/sources.list/live-snapshot | 9 --
examples/sources/beryl | 14 ++
examples/sources/debian-backports | 9 ++
examples/sources/debian-edu | 11 ++
examples/sources/fai | 9 ++
examples/sources/live-backports | 11 ++
examples/sources/live-snapshot | 9 ++
functions/chroot.sh | 2 +-
functions/common.sh | 2 +-
functions/defaults.sh | 224 +++++++++++++++------------
helpers/lh_binary_iso | 22 ++-
helpers/lh_chroot_hooks | 2 +-
helpers/lh_chroot_packages | 2 +-
helpers/lh_chroot_packageslists | 2 +-
helpers/lh_chroot_tasks | 2 +-
helpers/lh_config | 262 +++++++++++++++++---------------
helpers/lh_source_iso | 28 +++-
helpers/make-live | 16 +-
lists/rescue | 187 ++++++++++++++++++-----
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 | 2 +-
manpages/live-helper.en.7 | 2 +-
manpages/make-live.de.1 | 2 +-
manpages/make-live.en.1 | 2 +-
61 files changed, 665 insertions(+), 378 deletions(-)
create mode 100644 debian/logrotate
create mode 100644 debian/postrm
create mode 100644 examples/cron/crontab
delete mode 100644 examples/sources.list/beryl
delete mode 100644 examples/sources.list/debian-backports
delete mode 100644 examples/sources.list/debian-edu
delete mode 100644 examples/sources.list/fai
delete mode 100644 examples/sources.list/live-backports
delete mode 100644 examples/sources.list/live-snapshot
create mode 100644 examples/sources/beryl
create mode 100644 examples/sources/debian-backports
create mode 100644 examples/sources/debian-edu
create mode 100644 examples/sources/fai
create mode 100644 examples/sources/live-backports
create mode 100644 examples/sources/live-snapshot
diff --git a/Makefile b/Makefile
index 37df2f7..71814fd 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,9 @@ install: test
done; \
done
+ # Installing logfile
+ mkdir -p $(DESTDIR)/var/log
+
uninstall:
# Uninstalling executables
for HELPER in helpers/*; \
@@ -85,19 +88,22 @@ 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\\-14/2007\\-05\\-21/' \
- -e 's/14.05.2007/21.05.2007/' \
- -e 's/1.0~a10/1.0~a11/' \
+ 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/' \
$$MANPAGE; \
done
- sed -i -e 's/1.0~a10/1.0~a11/' functions/common.sh
-
- sed -i -e 's/1.0~a10/1.0~a11/' examples/cron/etch.sh
- sed -i -e 's/1.0~a10/1.0~a11/' examples/cron/etch+beryl.sh
+ 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; \
+ done
clean:
diff --git a/debian/changelog b/debian/changelog
index d682a1b..b8648fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a12-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 28 May 2007 00:00:00 +0200
+
live-helper (1.0~a11-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/cron.daily b/debian/cron.daily
index f7e205b..a8c139f 100644
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -35,6 +35,8 @@ else
exit 1
fi
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin daily build." >> /var/log/live
+
for ARCHITECTURE in ${ARCHITECTURES}
do
for DISTRIBUTION in ${DISTRIBUTIONS}
@@ -146,3 +148,5 @@ done
# Creating current symlink
rm -f "${DESTDIR}"/"${BUILD}"-builds/current
ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end daily build." >> /var/log/live
diff --git a/debian/logrotate b/debian/logrotate
new file mode 100644
index 0000000..91b5ed5
--- /dev/null
+++ b/debian/logrotate
@@ -0,0 +1,11 @@
+# /etc/logrotate.d/live-helper
+
+/var/log/live
+{
+ compress
+ copytruncate
+ missingok
+ monthly
+ notifempty
+ rotate 24
+}
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..09b0aca
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ purge)
+ rm -f /var/log/live*
+ ;;
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 3946bc2..83011f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ binary-indep: build install
dh_installchangelogs docs/ChangeLog
dh_installdocs
dh_install
+ dh_installlogrotate
dh_installcron
dh_installman
dh_compress
diff --git a/docs/CREDITS b/docs/CREDITS
index 48b4014..1304663 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -27,7 +27,7 @@ Special thanks (alphabetical order):
* Ben Armstrong <synrg@debian.org> for his IRC support.
* Jason D. Clinton <me@jasonclinton.com> for his work on netboot type.
* Otavio Salvador <otavio@debian.org> for his QA patches.
- * Richard Nelson <rjent@rjent.pair.com> for live-webbuilder.
+ * Richard Nelson <rjent@rjent.pair.com> for live-webhelper.
* Sebastian Raveau <sebastien.raveau@epita.fr> for his work on encryption
support.
* Scott Edwards <debian@foss.daxal.com> for his work on d-i/g-i integration.
diff --git a/docs/ChangeLog b/docs/ChangeLog
index d44af87..277ff48 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,18 @@
+2007-05-26 Daniel Baumann <daniel@debian.org>
+
+ * lists/rescue:
+ - Updated with suggestions from Inigo Tejedor Arrondo
+ <inigo@navarrux.org>
+ * Uploaded 1.0~a12-1.
+
+2007-05-25 Daniel Baumann <daniel@debian.org>
+
+ * functions/defaults.sh:
+ - Updated check for LH_BOOTSTRAP on ubuntu.
+ * helpers/lh_binary_iso, lh_source_iso:
+ - Added configuration support for ISO application, preparer and
+ publisher field.
+
2007-05-24 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_syslinux:
diff --git a/docs/TODO b/docs/TODO
index 12e03b1..62ae5c0 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,9 +4,6 @@ TODO list for live-helper
This file lists only outstanding tasks. Any additions/comments/questions and
help is welcome. Write to <debian-live-devel@lists.alioth.debian.org>.
-1.0~a12-1:
- * reordering content of configuration files
-
ALPHA series:
FIXME
@@ -16,9 +13,9 @@ FIXME
* yaboot (powerpc) boot support
* grub (i386/amd64) boot support on usb* binary images
* grub (i386/amd64) boot support on net binary images
- * multi-binary builds in one shot
+ * multi-{binary,architecture,distribution} builds in one shot
* vmlinu[xz]
- * breakpoints (yes/no/all/type)
+ * breakpoints (yes/no/all/type: soft ->interaction to stop/hard ->interaction to continue)
* check unset variables
ADDME
diff --git a/examples/cron/crontab b/examples/cron/crontab
new file mode 100644
index 0000000..2d6b052
--- /dev/null
+++ b/examples/cron/crontab
@@ -0,0 +1,8 @@
+# /etc/crontab - system-wide crontab
+
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+# m h dom mon dow user command
+*/1 * * * * root /etc/cron.d/live-webhelper > /dev/null 2>&1
+*/10 * * * * user /usr/share/doc/live-helper/examples/cron/snapshots.sh > /dev/null 2>&1
diff --git a/examples/cron/daily.sh b/examples/cron/daily.sh
index ef55099..f2b5c09 100755
--- a/examples/cron/daily.sh
+++ b/examples/cron/daily.sh
@@ -53,6 +53,8 @@ else
exit 1
fi
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin daily build." >> /var/log/live
+
for ARCHITECTURE in ${ARCHITECTURES}
do
for DISTRIBUTION in ${DISTRIBUTIONS}
@@ -164,3 +166,5 @@ done
# Creating current symlink
rm -f "${DESTDIR}"/"${BUILD}"-builds/current
ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end daily build." >> /var/log/live
diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh
index a51bf01..28a51b5 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~a11-1"
+DATE="r0_1.0~a12-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
@@ -53,6 +53,8 @@ else
exit 1
fi
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin etch+beryl build." >> /var/log/live
+
for ARCHITECTURE in ${ARCHITECTURES}
do
for DISTRIBUTION in ${DISTRIBUTIONS}
@@ -173,3 +175,5 @@ done
# Creating current symlink
rm -f "${DESTDIR}"/"${BUILD}"-builds/current
ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end etch+beryl build." >> /var/log/live
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index 3bf2afd..cf8ec2e 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~a11-1"
+DATE="r0_1.0~a12-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
@@ -53,6 +53,8 @@ else
exit 1
fi
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin etch build." >> /var/log/live
+
for ARCHITECTURE in ${ARCHITECTURES}
do
for DISTRIBUTION in ${DISTRIBUTIONS}
@@ -164,3 +166,5 @@ done
# Creating current symlink
rm -f "${DESTDIR}"/"${BUILD}"-builds/current
ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end etch build." >> /var/log/live
diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh
index 199dc29..760b041 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-webbuilder"
+PACKAGES="live-helper live-initramfs live-webhelper"
DEBEMAIL="debian-live-devel@lists.alioth.debian.org"
EMAIL="debian-live-devel@lists.alioth.debian.org"
@@ -36,6 +36,8 @@ trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Up
# Creating lock file
echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin snapshot build." >> /var/log/live
+
# Processing packages
for PACKAGE in ${PACKAGES}
do
@@ -128,3 +130,5 @@ EOF
# Removing build directory
rm -rf "${TEMPDIR}"
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end snapshot build." >> /var/log/live
diff --git a/examples/cron/weekly.sh b/examples/cron/weekly.sh
index d3f9d79..19c1054 100755
--- a/examples/cron/weekly.sh
+++ b/examples/cron/weekly.sh
@@ -53,6 +53,8 @@ else
exit 1
fi
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin weekly build." >> /var/log/live
+
for ARCHITECTURE in ${ARCHITECTURES}
do
for DISTRIBUTION in ${DISTRIBUTIONS}
@@ -164,3 +166,5 @@ done
# Creating current symlink
rm -f "${DESTDIR}"/"${BUILD}"-builds/current
ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end weekly build." >> /var/log/live
diff --git a/examples/sources.list/beryl b/examples/sources.list/beryl
deleted file mode 100644
index 9c1cd2e..0000000
--- a/examples/sources.list/beryl
+++ /dev/null
@@ -1,14 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Beryl Etch repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. beryl.bootstrap and once as beryl.binary.
-## Additionally, you need to copy the beryl.sh file to your
-## config/chroot_local-hooks directory.
-##
-## Remeber to also import http://debian.beryl-project.org/root@lupine.me.uk.gpg
-## into your trusted keyring.
-
-# Beryl packages for Etch
-deb http://debian.beryl-project.org/ etch main
-deb-src http://debian.beryl-project.org/ etch main
diff --git a/examples/sources.list/debian-backports b/examples/sources.list/debian-backports
deleted file mode 100644
index 04362f0..0000000
--- a/examples/sources.list/debian-backports
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Etch backports repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. debian-backports.bootstrap and once as debian-backports.binary.
-
-# Debian backports for Etch
-deb http://www.backports.org/debian/ etch-backports main
-deb-src http://www.backports.org/debian/ etch-backports main
diff --git a/examples/sources.list/debian-edu b/examples/sources.list/debian-edu
deleted file mode 100644
index 9fb05e1..0000000
--- a/examples/sources.list/debian-edu
+++ /dev/null
@@ -1,11 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Edu/Skolelinux repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. edu.bootstrap and once as edu.binary.
-##
-## Remeber to add debian-edu-archive-keyring to your package selection.
-
-# Debian Edu/Skolelinux
-deb http://ftp.skolelinux.org/skolelinux/ etch-test local
-deb-src http://ftp.skolelinux.org/skolelinux/ etch-test local
diff --git a/examples/sources.list/fai b/examples/sources.list/fai
deleted file mode 100644
index 7d2d7ec..0000000
--- a/examples/sources.list/fai
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## FAI - Fully Automated Install repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. fai.bootstrap and once as fai.binary.
-
-# FAI - Fully Automated Install
-deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln
-deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln
diff --git a/examples/sources.list/live-backports b/examples/sources.list/live-backports
deleted file mode 100644
index 3c1a2c1..0000000
--- a/examples/sources.list/live-backports
+++ /dev/null
@@ -1,11 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Etch backports repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-backports.bootstrap and once as live-backports.binary.
-##
-## Remeber to add debian-unofficial-archive-keyring to your package selection.
-
-# Debian Live backports for Etch
-deb http://live.debian.net/debian/ etch main
-deb-src http://live.debian.net/debian/ etch main
diff --git a/examples/sources.list/live-snapshot b/examples/sources.list/live-snapshot
deleted file mode 100644
index 763deda..0000000
--- a/examples/sources.list/live-snapshot
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Snapshot repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-snapshots.bootstrap and once as live-snapshots.binary.
-
-# Debian Live Snapshots
-deb http://live.debian.net/debian-snapshots/ ./
-deb-src http://live.debian.net/debian-snapshots/ ./
diff --git a/examples/sources/beryl b/examples/sources/beryl
new file mode 100644
index 0000000..9c1cd2e
--- /dev/null
+++ b/examples/sources/beryl
@@ -0,0 +1,14 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Beryl Etch repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. beryl.bootstrap and once as beryl.binary.
+## Additionally, you need to copy the beryl.sh file to your
+## config/chroot_local-hooks directory.
+##
+## Remeber to also import http://debian.beryl-project.org/root@lupine.me.uk.gpg
+## into your trusted keyring.
+
+# Beryl packages for Etch
+deb http://debian.beryl-project.org/ etch main
+deb-src http://debian.beryl-project.org/ etch main
diff --git a/examples/sources/debian-backports b/examples/sources/debian-backports
new file mode 100644
index 0000000..04362f0
--- /dev/null
+++ b/examples/sources/debian-backports
@@ -0,0 +1,9 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. debian-backports.bootstrap and once as debian-backports.binary.
+
+# Debian backports for Etch
+deb http://www.backports.org/debian/ etch-backports main
+deb-src http://www.backports.org/debian/ etch-backports main
diff --git a/examples/sources/debian-edu b/examples/sources/debian-edu
new file mode 100644
index 0000000..9fb05e1
--- /dev/null
+++ b/examples/sources/debian-edu
@@ -0,0 +1,11 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Edu/Skolelinux repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. edu.bootstrap and once as edu.binary.
+##
+## Remeber to add debian-edu-archive-keyring to your package selection.
+
+# Debian Edu/Skolelinux
+deb http://ftp.skolelinux.org/skolelinux/ etch-test local
+deb-src http://ftp.skolelinux.org/skolelinux/ etch-test local
diff --git a/examples/sources/fai b/examples/sources/fai
new file mode 100644
index 0000000..7d2d7ec
--- /dev/null
+++ b/examples/sources/fai
@@ -0,0 +1,9 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## FAI - Fully Automated Install repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. fai.bootstrap and once as fai.binary.
+
+# FAI - Fully Automated Install
+deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln
+deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln
diff --git a/examples/sources/live-backports b/examples/sources/live-backports
new file mode 100644
index 0000000..3c1a2c1
--- /dev/null
+++ b/examples/sources/live-backports
@@ -0,0 +1,11 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Live Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. live-backports.bootstrap and once as live-backports.binary.
+##
+## Remeber to add debian-unofficial-archive-keyring to your package selection.
+
+# Debian Live backports for Etch
+deb http://live.debian.net/debian/ etch main
+deb-src http://live.debian.net/debian/ etch main
diff --git a/examples/sources/live-snapshot b/examples/sources/live-snapshot
new file mode 100644
index 0000000..763deda
--- /dev/null
+++ b/examples/sources/live-snapshot
@@ -0,0 +1,9 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Live Snapshot repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. live-snapshots.bootstrap and once as live-snapshots.binary.
+
+# Debian Live Snapshots
+deb http://live.debian.net/debian-snapshots/ ./
+deb-src http://live.debian.net/debian-snapshots/ ./
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 26ecec9..4b9e850 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -15,7 +15,7 @@ Chroot ()
# Executing commands in chroot
Echo_debug "Executing: ${COMMANDS}"
- ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
+ ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
return "${?}"
}
diff --git a/functions/common.sh b/functions/common.sh
index c4c361d..604d15a 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
-VERSION="1.0~a11"
+VERSION="1.0~a12"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 0cbbfeb..ccba6f8 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -60,12 +60,6 @@ Set_defaults ()
fi
fi
- # Setting apt indices
- if [ -z "${LIVE_BINARY_INDICES}" ]
- then
- LIVE_BINARY_INDICES="enabled"
- fi
-
# Setting apt pdiffs
if [ -z "${LH_APT_PDIFFS}" ]
then
@@ -102,17 +96,14 @@ Set_defaults ()
;;
ubuntu)
- if [ -x "/usr/sbin/debootstrap" ]
+ if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
then
- if [ -f /usr/lib/debootstrap/scripts/feisty ]
- then
- LH_BOOTSTRAP="debootstrap"
- else
- echo "E: Your version of debootstrap does not support ubuntu."
- exit 1
- fi
+ LH_BOOTSTRAP="cdebootstrap"
+ elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
+ then
+ LH_BOOTSTRAP="debootstrap"
else
- echo "E: You need to install debootstrap from Ubuntu in order to bootstrap ubuntu."
+ echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
exit 1
fi
;;
@@ -141,14 +132,14 @@ Set_defaults ()
LH_DEBCONF_FRONTEND="noninteractive"
fi
- if [ -z "${LH_DEBCONF_PRIORITY}" ]
+ if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
then
- LH_DEBCONF_PRIORITY="critical"
+ LH_DEBCONF_NOWARNINGS="yes"
fi
- if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
+ if [ -z "${LH_DEBCONF_PRIORITY}" ]
then
- LH_DEBCONF_NOWARNINGS="yes"
+ LH_DEBCONF_PRIORITY="critical"
fi
# Setting genisoimage
@@ -165,10 +156,21 @@ Set_defaults ()
esac
fi
+ # Setting initramfs hook
+ if [ -z "${LH_INITRAMFS}" ]
+ then
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ LH_INITRAMFS="casper"
+ else
+ LH_INITRAMFS="live-initramfs"
+ fi
+ fi
+
# Setting losetup
if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
then
- # Check for loop-aes-utils divertion
+ # Workaround for loop-aes-utils divertion
if [ -x /sbin/losetup.orig ]
then
LH_LOSETUP="losetup.orig"
@@ -180,21 +182,17 @@ Set_defaults ()
fi
fi
- # Setting tasksel
- if [ -z "${LH_TASKSEL}" ]
+ # If we are root, disable root command
+ if [ "`id -u`" = "0" ]
then
- LH_TASKSEL="aptitude"
+ # FIXME: this is disabled until considered save
+ LIVE_ROOT_COMMAND=""
fi
- # Setting initramfs generator
- if [ -z "${LH_INITRAMFS}" ]
+ # Setting tasksel
+ if [ -z "${LH_TASKSEL}" ]
then
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- LH_INITRAMFS="casper"
- else
- LH_INITRAMFS="live-initramfs"
- fi
+ LH_TASKSEL="aptitude"
fi
# Setting root directory
@@ -249,12 +247,6 @@ Set_defaults ()
LH_VERBOSE="disabled"
fi
- # If we are root, disable root command
- if [ "`id -u`" = "0" ]
- then
- LIVE_ROOT_COMMAND=""
- fi
-
## config/bootstrap
# Setting architecture value
@@ -264,7 +256,8 @@ Set_defaults ()
then
LIVE_ARCHITECTURE="`dpkg --print-architecture`"
else
- echo "E: Can't process file /usr/bin/dpkg (FIXME)"
+ echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
+ LIVE_ARCHITECTURE="i386"
fi
fi
@@ -363,13 +356,27 @@ Set_defaults ()
## config/chroot
+ # Setting chroot filesystem
+ if [ -z "${LIVE_CHROOT_FILESYSTEM}" ]
+ then
+ LIVE_CHROOT_FILESYSTEM="squashfs"
+ fi
+
+ # LIVE_HOOKS
+
# Setting interactive shell/X11/Xnest
if [ -z "${LIVE_INTERACTIVE}" ]
then
LIVE_INTERACTIVE="disabled"
fi
- # Setting kernel flavour string
+ # Setting keyring packages
+ # LIVE_KEYRING_PACKAGES
+
+ # Setting language string
+ # LIVE_LANGUAGE
+
+ # Setting linux flavour string
if [ -z "${LIVE_LINUX_FLAVOURS}" ]
then
case "${LIVE_ARCHITECTURE}" in
@@ -431,6 +438,7 @@ Set_defaults ()
case "${LH_MODE}" in
debian)
LIVE_LINUX_FLAVOURS="sparc32"
+ # FIXME: needs update after etch
;;
ubuntu)
@@ -445,7 +453,7 @@ Set_defaults ()
esac
fi
- # Set kernel packages
+ # Set linux packages
if [ -z "${LIVE_LINUX_PACKAGES}" ]
then
case "${LH_MODE}" in
@@ -464,15 +472,6 @@ Set_defaults ()
fi
fi
- # Setting keyring packages
- # LIVE_KEYRING_PACKAGES
-
- # Setting language string
- # LIVE_LANGUAGE
-
- # Setting tasks
- # LIVE_TASKS
-
# Setting packages string
# LIVE_PACKAGES
@@ -510,7 +509,8 @@ Set_defaults ()
LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
- # LIVE_HOOKS
+ # Setting tasks
+ # LIVE_TASKS
# Setting security updates option
if [ -z "${LIVE_SECURITY}" ]
@@ -530,20 +530,49 @@ Set_defaults ()
LIVE_SYSVINIT="disabled"
fi
- ## config/image
+ ## config/binary
+
+ # Setting image type
+ if [ -z "${LIVE_BINARY_IMAGES}" ]
+ then
+ LIVE_BINARY_IMAGES="iso"
+ fi
+
+ # Setting apt indices
+ if [ -z "${LIVE_BINARY_INDICES}" ]
+ then
+ LIVE_BINARY_INDICES="enabled"
+ fi
# Setting boot parameters
# LIVE_BOOTAPPEND
- # Setting encryption
- # LIVE_ENCRYPTION
+ # Setting bootloader
+ if [ -z "${LIVE_BOOTLOADER}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386)
+ LIVE_BOOTLOADER="syslinux"
+ ;;
- # Setting username
- if [ -z "${LIVE_USERNAME}" ]
+ powerpc)
+ LIVE_BOOTLOADER="yaboot"
+ ;;
+ esac
+ fi
+
+ # Setting debian-installer option
+ if [ -z "${LIVE_DEBIAN_INSTALLER}" ]
then
- LIVE_USERNAME="user"
+ LIVE_DEBIAN_INSTALLER="disabled"
fi
+ # Setting encryption
+ # LIVE_ENCRYPTION
+
+ # Setting grub splash
+ # LIVE_GRUB_SPLASH
+
# Setting hostname
if [ -z "${LIVE_HOSTNAME}" ]
then
@@ -558,34 +587,30 @@ Set_defaults ()
esac
fi
- # Setting image type
- if [ -z "${LIVE_BINARY_IMAGES}" ]
+ # Setting iso author
+ if [ -z "${LIVE_ISO_APPLICATION}" ]
then
- LIVE_BINARY_IMAGES="iso"
- fi
+ case "${LH_MODE}" in
+ debian)
+ LIVE_ISO_APPLICATION="Debian Live"
+ ;;
- # Setting image type
- if [ -z "${LIVE_SOURCE_IMAGES}" ]
- then
- LIVE_SOURCE_IMAGES="generic"
+ ubuntu)
+ LIVE_ISO_APPLICATION="Ubuntu Live"
+ ;;
+ esac
fi
- # Setting chroot filesystem
- if [ -z "${LIVE_CHROOT_FILESYSTEM}" ]
+ # Set iso preparer
+ if [ -z "${LIVE_ISO_PREPARER}" ]
then
- LIVE_CHROOT_FILESYSTEM="squashfs"
+ LIVE_ISO_PREPARER="live-helper \${VERSION}; http://packages.qa.debian.org/live-helper"
fi
- # Setting memtest option
- if [ -z "${LIVE_MEMTEST}" ]
+ # Set iso publisher
+ if [ -z "${LIVE_ISO_PUBLISHER}" ]
then
- LIVE_MEMTEST="memtest86+"
- fi
-
- # Setting debian-installer option
- if [ -z "${LIVE_DEBIAN_INSTALLER}" ]
- then
- LIVE_DEBIAN_INSTALLER="disabled"
+ LIVE_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org"
fi
# Setting iso volume
@@ -593,19 +618,19 @@ Set_defaults ()
then
case "${LH_MODE}" in
debian)
- LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d\`"
+ LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
;;
ubuntu)
- LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d\`"
+ LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
;;
esac
fi
- # Setting netboot server address
- if [ -z "${LIVE_NET_SERVER}" ]
+ # Setting memtest option
+ if [ -z "${LIVE_MEMTEST}" ]
then
- LIVE_NET_SERVER="192.168.1.1"
+ LIVE_MEMTEST="memtest86+"
fi
# Setting netboot server path
@@ -622,29 +647,32 @@ Set_defaults ()
esac
fi
+ # Setting netboot server address
+ if [ -z "${LIVE_NET_SERVER}" ]
+ then
+ LIVE_NET_SERVER="192.168.1.1"
+ fi
+
+ # Setting syslinux splash
+ # LIVE_SYSLINUX_SPLASH
+
+ # Setting username
+ if [ -z "${LIVE_USERNAME}" ]
+ then
+ LIVE_USERNAME="user"
+ fi
+
+ ## config/source
+
# Setting source option
if [ -z "${LIVE_SOURCE}" ]
then
LIVE_SOURCE="disabled"
fi
- # Setting grub
- if [ -z "${LIVE_BOOTLOADER}" ]
+ # Setting image type
+ if [ -z "${LIVE_SOURCE_IMAGES}" ]
then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- LIVE_BOOTLOADER="syslinux"
- ;;
-
- powerpc)
- LIVE_BOOTLOADER="yaboot"
- ;;
- esac
+ LIVE_SOURCE_IMAGES="generic"
fi
-
- # Setting grub splash
- # LIVE_GRUB_SPLASH
-
- # Setting syslinux splash
- # LIVE_SYSLINUX_SPLASH
}
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 2f9fc2e..0bea7e3 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -67,6 +67,26 @@ do
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
@@ -102,7 +122,7 @@ do
fi
cat >> chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
EOF
Chroot "sh binary.sh"
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 3f874e6..8f5c988 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -71,7 +71,7 @@ do
fi
done
-if [ -n "${LIVE_HOOKS}" ]
+if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
then
LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
fi
diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index 5721959..e94cdda 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LIVE_PACKAGES}" ]
+if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_packages
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index fc915f4..d1d9a13 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LIVE_PACKAGES_LISTS}" ]
+if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_packageslists
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 0e096d4..9b6da5b 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -46,7 +46,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LIVE_TASKS}" ]
+if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_tasks
diff --git a/helpers/lh_config b/helpers/lh_config
index 5477dd0..7020536 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -55,18 +55,14 @@ Set_defaults
Breakpoint "config: Init"
-# Creating configuration directory
+# Creating bootstrap configuration
mkdir -p "${LIVE_ROOT}"/config
mkdir -p "${LIVE_ROOT}"/config/includes
mkdir -p "${LIVE_ROOT}"/config/templates
# Creating live-helper configuration
cat > "${LIVE_ROOT}"/config/common << EOF
-# config/common: configuration for live-helper(7)
-
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
+# config/common - common options for live-helper(7)
# \$LH_APT: set package manager
# (Default: ${LH_APT})
@@ -84,59 +80,67 @@ LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
# (Default: ${LH_APT_PDIFFS})
LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-# \$LH_APT_RECOMMENDS: enable recommends
+# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
# (Default: ${LH_APT_RECOMMENDS})
LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-# \$LH_APT_SECURE: enable secure
+# \$LH_APT_SECURE: set apt/aptitude security
# (Default: ${LH_APT_SECURE})
LH_APT_SECURE="${LH_APT_SECURE}"
-# \$LH_BOOTSTRAP: select the bootstrap program
+# \$LH_BOOTSTRAP: set bootstrap program
# (Default: ${LH_BOOTSTRAP})
LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-# \$LH_CACHE_INDICES: control if downloaded packages should be cached
+# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
# (Default: ${LH_CACHE_INDICES})
LH_CACHE_INDICES="${LH_CACHE_INDICES}"
-# \$LH_CACHE_PACKAGES: control if downloaded packages should be cached
+# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
# (Default: ${LH_CACHE_PACKAGES})
LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
-# \$LH_CACHE_STAGES: control if downloaded packages should be cached
+# \$LH_CACHE_STAGES: control if completed stages should be cached
# (Default: ${LH_CACHE_STAGES})
LH_CACHE_STAGES="${LH_CACHE_STAGES}"
-# \$LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
+# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
# (Default: ${LH_DEBCONF_FRONTEND})
LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-# \$LH_DEBCONF_PRIORITY: set the debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
# (Default: ${LH_DEBCONF_NOWARNINGS})
LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-# \$LH_GENISOIMAGE: set the genisoimage program
+# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LH_DEBCONF_PRIORITY})
+LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+
+# \$LH_GENISOIMAGE: set genisoimage program
# (Default: ${LH_GENISOIMAGE})
LH_GENISOIMAGE="${LH_GENISOIMAGE}"
-# \$LH_LOSETUP: set the losetup program
+# \$LH_INITRAMFS: set initramfs hook
+# (Default: ${LH_INITRAMFS})
+LH_INITRAMFS="${LH_INITRAMFS}"
+
+# \$LH_LOSETUP: set losetup program
# (Default: autodetected)
LH_LOSETUP="${LH_LOSETUP}"
-# \$LH_TASKSEL: set the tasksel program
+# \$LH_MODE: set distribution mode
+# (Default: ${LH_MODE})
+LH_MODE="${LH_MODE}"
+
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# \$LH_TASKSEL: set tasksel program
# (Default: ${LH_TASKSEL})
LH_TASKSEL="${LH_TASKSEL}"
-# \$LH_INITRAMFS: set the initramfs generator
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
-
-# \$LIVE_ROOT: set the root directory
+# \$LIVE_ROOT: set root directory
# (Default: ${LIVE_ROOT})
LIVE_ROOT="${LIVE_ROOT}"
@@ -150,10 +154,6 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}"
# Live-helper options
-# \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
# \$LH_BREAKPOINTS: enable breakpoints
# (Default: ${LH_BREAKPOINTS})
#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
@@ -175,47 +175,94 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}"
#LH_VERBOSE="${LH_VERBOSE}"
EOF
+# Creating lh_bootstrap_* configuration
+cat > "${LIVE_ROOT}"/config/bootstrap << EOF
+# config/bootstrap - options for live-helper(7), bootstrap stage
+
+# \$LIVE_ARCHITECTURE: select chroot architecture
+# (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
+# (Default: empty)
+LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
+
+# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
+LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+
+# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
+
+# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
+LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
+
+# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
+
+# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
+LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
+
+# \$LIVE_SECTIONS: select section(s) to use
+# (Default: ${LIVE_SECTIONS})
+LIVE_SECTIONS="${LIVE_SECTIONS}"
+EOF
+
# Creating lh_chroot_* configuration
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+
cat > "${LIVE_ROOT}"/config/chroot << EOF
-# config/chroot: configuration for lh_chroot_*
+# config/chroot - options for live-helper(7), chroot stage
# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
# (Default: ${LIVE_CHROOT_FILESYSTEM})
LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+# \$LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS="${LIVE_HOOKS}"
+
# \$LIVE_INTERACTIVE: set interactive build
# (Default: ${LIVE_INTERACTIVE})
LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
-# \$LIVE_LINUX_FLAVOURS: set the kernel flavour to use
-# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
-
-# \$LIVE_LINUX_PACKAGES: set the kernel packages to use
-# (Default: autodetected)
-LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
-
-# \$LIVE_KEYRING_PACKAGES: set the keyring packages
+# \$LIVE_KEYRING_PACKAGES: set keyring packages
# (Default: empty)
LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
-# \$LIVE_HOOKS: set hook commands
-# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
-
-# \$LIVE_LANGUAGE: set the language to use
+# \$LIVE_LANGUAGE: set language to use
# (Default: empty)
LIVE_LANGUAGE="${LIVE_LANGUAGE}"
-# \$LIVE_PACKAGES: set the packages to install
+# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
+
+# \$LIVE_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
+
+# \$LIVE_PACKAGES: set packages to install
# (Default: empty)
LIVE_PACKAGES="${LIVE_PACKAGES}"
-# \$LIVE_PACKAGES_LISTS: set the package list to install
+# \$LIVE_PACKAGES_LISTS: set package list to install
# (Default: ${LIVE_PACKAGES_LISTS})
LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
-# \$LIVE_TASKS: set the tasks to install
+# \$LIVE_TASKS: set tasks to install
# (Default: empty)
LIVE_TASKS="${LIVE_TASKS}"
@@ -232,57 +279,17 @@ LIVE_SYMLINKS="${LIVE_SYMLINKS}"
LIVE_SYSVINIT="${LIVE_SYSVINIT}"
EOF
-# Creating lh_chroot_* directories
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
-
-# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
-# config/bootstrap: configuration for lh_bootstrap_*
-
-# \$LIVE_ARCHITECTURE: select the chroot architecture
-# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
-
-# \$LIVE_DISTRIBUTION: select the distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory
-# (Default: empty)
-LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
-
-# \$LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-
-# \$LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP})
-LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
-
-# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
-LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
-
-# \$LIVE_MIRROR_BINARY: set the mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY})
-LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
-
-# \$LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
-LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
-
-# \$LIVE_SECTIONS: select the section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
-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_syslinux
+
cat > "${LIVE_ROOT}"/config/binary << EOF
-# config/chroot: configuration for lh_binary_*
+# config/binary - options for live-helper(7), binary stage
+
+# \$LIVE_BINARY_IMAGES: set image type
+# (Default: ${LIVE_BINARY_IMAGES})
+LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
# (Default: ${LIVE_BINARY_INDICES})
@@ -292,69 +299,72 @@ LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
# (Default: empty)
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
+# \$LIVE_BOOTLOADER: set bootloader
+# (Default: ${LIVE_BOOTLOADER})
+LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+
+# \$LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LIVE_DEBIAN_INSTALLER})
+LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+
# \$LIVE_ENCRYPTION: set encrytion
# (Default: empty)
LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
+# \$LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
# \$LIVE_HOSTNAME: set hostname
# (Default: ${LIVE_HOSTNAME})
LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
+# \$LIVE_ISO_APPLICATION: set iso author
+# (Default: ${LIVE_ISO_APPLICATION})
+LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
-# \$LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LIVE_DEBIAN_INSTALLER})
-LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+# \$LIVE_ISO_PREPARER: set iso preparer
+# (Default: ${LIVE_ISO_PREPARER})
+LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
+
+# \$LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: ${LIVE_ISO_PUBLISHER})
+LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
# \$LIVE_ISO_VOLUME: set iso volume
# (Default: ${LIVE_ISO_VOLUME})
LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-# \$LIVE_NET_SERVER: set the netboot server address
-# (Default: ${LIVE_NET_SERVER})
-LIVE_NET_SERVER="${LIVE_NET_SERVER}"
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
-# \$LIVE_NET_PATH: set the netboot server directory
+# \$LIVE_NET_PATH: set netboot server directory
# (Default: ${LIVE_NET_PATH})
LIVE_NET_PATH="${LIVE_NET_PATH}"
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
-
-# \$LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
+# \$LIVE_NET_SERVER: set netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-# \$LIVE_BINARY_IMAGES: set image type
-# (Default: ${LIVE_BINARY_IMAGES})
-LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
+# \$LIVE_USERNAME: set username
+# (Default: ${LIVE_USERNAME})
+LIVE_USERNAME="${LIVE_USERNAME}"
EOF
# Creating lh_source_* configuration
cat > "${LIVE_ROOT}"/config/source << EOF
-# config/chroot: configuration for lh_source_*
+# config/source - options for live-helper(7), source stage
# \$LIVE_SOURCE: set source option
-# (Default: ${LH_SOURCE})
+# (Default: ${LIVE_SOURCE})
LIVE_SOURCE="${LIVE_SOURCE}"
# \$LIVE_SOURCE_IMAGES: set image type
# (Default: ${LIVE_SOURCE_IMAGES})
LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
EOF
-
-# Creating lh_binary_* directories
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index 0784747..426fac7 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_iso(1) - build source iso image
+# lh_source_iso(1) - build iso source image
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -16,7 +16,7 @@ do
done
# Set static variables
-DESCRIPTION="build source iso image"
+DESCRIPTION="build iso source image"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -61,7 +61,7 @@ do
# Installing depends
Install_package
- # Remove old source
+ # Remove old iso image
if [ -f source.iso ]
then
rm -f source.iso
@@ -72,11 +72,31 @@ do
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 source chroot
cat >> chroot/source.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o source.iso -r -J -l -cache-inodes source
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
EOF
Chroot "sh source.sh"
diff --git a/helpers/make-live b/helpers/make-live
index 65fd20a..d4ad57a 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -37,7 +37,7 @@ HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep
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-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 -- "${@}"`"
+ 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" ]
then
@@ -248,6 +248,18 @@ Local_arguments ()
LIVE_MEMTEST="${2}"; shift 2
;;
+ --iso-application)
+ LIVE_ISO_APPLICATION="${2}"; shift 2
+ ;;
+
+ --iso-preparer)
+ LIVE_ISO_PREPARER="${2}"; shift 2
+ ;;
+
+ --iso-publisher)
+ LIVE_ISO_PUBLISHER="${2}"; shift 2
+ ;;
+
--iso-volume)
LIVE_ISO_VOLUME="${2}"; shift 2
;;
@@ -357,7 +369,7 @@ Main ()
Local_arguments "${@}"
# Configuring (this is really shit!)
- LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+ LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
if [ "${LH_BREAKPOINTS}" = "enabled" ]
then
diff --git a/lists/rescue b/lists/rescue
index dee78fe..0e8d1ba 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -6,52 +6,159 @@ eject file sudo vim-tiny
# Standard
console-common kbd locales
-# Rescue
-
-# Editors
-mc nano-tiny qemacs-nox mg aview
-# Harddisk
-hdparm blktool scsitools
-# Memory
-dmidecode
-# System
-procinfo pciutils usbutils hwinfo hwtools x86info cpuid
-# Tools
-tofrodos rpncalc units
-# Browser
-lynx links w3m
-# Compression
-unzip zip
-# Backup
-dar ddrescue gddrescue
+##### Rescue
+## System
+
+gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
+
+## Editors
+aview mc nano-tiny qemacs-nox mg vim wdiff
+
+## Harddisk
+dosfstools dvd+rw-tools e2fsprogs ext2resize genisoimage hdparm blktool ntfsprogs parted partimage reiserfsprogs secure-delete scsitools smartmontools testdisk wodim wipe xfsprogs
+
+## System
+dmidecode lshw pciutils procinfo read-edid sysutils usbutils
+
+## Browser
+lynx links2 w3m
+
+## Compression
+bzip2 rar unace unrar unzip zip
+
+## Backup
+#dar ddrescue gddrescue
+
+## GENERAL
+chrootuid
+cryptcat
+directvnc
+dnstracer
+etherwake
+ftp
+ifenslave-2.6
+ifrename
+ipcalc
+mailx
+mii-diag
+minicom
+netcat
+netcat6
+netmask
+openntpd
+openssl
+openvpn
+sipcalc
+socat
+ssh
+telnet
+
+## FIREWALLING
+denyhosts
+fail2ban
+iptables
+knockd
+portsentry
+reaim
+vlan
+zorp
+
+## BRIDGING
+bridge-utils
+ebtables
+parprouted
+
+## ROUTING
+cutter
+iproute
+iproute-doc
+iputils-tracepath
+mrt
+mtr-tiny
+tcptraceroute
+traceproto
+traceroute
+spinner
+
+## MONITORING
+arpalert
+arpwatch
+atsar
+bmon
+ethstatus
+ettercap
+geopip-bin
+hp-search-mac
+icmpinfo
+ifstat
+iftop
+ipgrab
+iptstate
+irpas
+lft
+nast
+nbtscan
+netdiscover
+nload
+nsca
+nstreams
+ntop
+pasd
+saidar
+samhain
+scanssh
+sntop
+ssldump
+tcpdump
+tcpreen
+tcpreplay
+tshark
+
+## TESTING
+crashme
+dbench
+doscan
+dsniff
+fragrouter
+honeyd
+hping3
+icmpush
+irpas
+macchanger
+medusa
+ndiff
+netdiag
+netpipe-tcp
+nmap
+ndisc6
+ngrep
+nsed
+p0f
+packit
+paketto
+sing
+xprobe
+
+## LOG-ANALIZERS
+fwanalog
+fwlogwatch
+lwatch
+multitail
+
+#unsorted
+
+hwinfo hwtools x86info cpuid
+tofrodos rpncalc
hal
-read-edid
-discover
-wdiff
-gawk
dc
-dash
rlwrap
posh
chkrootkit
+
rkhunter
-parted
-partimage
-grub
-lilo
-testdisk
-xfsprogs
-reiserfsprogs
-e2fsprogs
-ext2resize
-ntfsprogs
-dosfstools
-genisoimage
-wodim
-dvd+rw-tools
clamav
clamav-data
-wipe
-secure-delete
-minicom
+smbclient
+nfs-common
+wireless-tools
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index f54caa3..0207347 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_BINARY 1 "28.05.2007" "1.0~a12" "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 49eb816..69800fb 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_BINARY 1 "2007\-05\-28" "1.0~a12" "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 fa972da..f2f69ae 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_BOOTSTRAP 1 "28.05.2007" "1.0~a12" "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 705e271..285959a 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-05\-28" "1.0~a12" "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 354e0b1..5590fb7 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "28.05.2007" "1.0~a12" "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 a787509..b81817d 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\-21" "1.0~a11" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-28" "1.0~a12" "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 7e0dc78..cb8e00d 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "28.05.2007" "1.0~a12" "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 655a854..70b9bb3 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\-21" "1.0~a11" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-28" "1.0~a12" "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 c4ebe14..f4ea33f 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_BUILD 1 "28.05.2007" "1.0~a12" "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 7921b9e..42306da 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_BUILD 1 "2007\-05\-28" "1.0~a12" "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 54eb081..32854bf 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_CHROOT 1 "28.05.2007" "1.0~a12" "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 14ce0fd..b423e71 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_CHROOT 1 "2007\-05\-28" "1.0~a12" "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 2709fe9..ddc66b6 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_CLEAN 1 "28.05.2007" "1.0~a12" "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 25bfb25..17d3180 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_CLEAN 1 "2007\-05\-28" "1.0~a12" "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 34a6c90..c3e8cfd 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_SOURCE 1 "28.05.2007" "1.0~a12" "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 7538d04..a642689 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_SOURCE 1 "2007\-05\-28" "1.0~a12" "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 62ad87f..f3a0eec 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LH_TESTROOT 1 "28.05.2007" "1.0~a12" "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 b84ca92..5488a8b 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-05\-28" "1.0~a12" "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 673d57d..8e02352 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "21.05.2007" "1.0~a11" "live\-helper"
+.TH LIVE\-HELPER 7 "28.05.2007" "1.0~a12" "live\-helper"
.SH NAME
live\-helper \- Debian Live Helper-Programme
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index 3c31c7b..61bf5f9 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-05\-28" "1.0~a12" "live\-helper"
.SH NAME
live\-helper \- Debian Live helper programs
diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1
index b34f36c..21884ec 100644
--- a/manpages/make-live.de.1
+++ b/manpages/make-live.de.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "21.05.2007" "1.0~a11" "live\-helper"
+.TH MAKE\-LIVE 1 "28.05.2007" "1.0~a12" "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 fb72a14..aaf5e76 100644
--- a/manpages/make-live.en.1
+++ b/manpages/make-live.en.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+.TH MAKE\-LIVE 1 "2007\-05\-28" "1.0~a12" "live\-helper"
.SH NAME
make\-live \- build a Debian Live system
--
cgit v1.0