From 86726af9f5e7873d6cdbbe108fae1c41b1b67db0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:09 +0200
Subject: Adding live-helper 1.0~a11-1.
---
Makefile | 12 +-
debian/changelog | 6 +
debian/changelog.live-package | 208 ++++++++++++++
debian/changelog.old | 208 --------------
debian/rules | 4 +-
docs/ChangeLog | 9 +
docs/ChangeLog.live-package | 474 ++++++++++++++++++++++++++++++++
docs/ChangeLog.old | 474 --------------------------------
docs/NEWS | 4 +
docs/TODO | 3 +-
examples/cron/daily.sh | 2 +-
examples/cron/etch+beryl.sh | 4 +-
examples/cron/etch.sh | 4 +-
examples/cron/weekly.sh | 2 +-
functions/common.sh | 2 +-
helpers/lh_binary_debian-installer | 66 ++++-
helpers/lh_binary_grub | 53 +++-
helpers/lh_binary_includes | 2 +-
helpers/lh_binary_linux-image | 13 +-
helpers/lh_binary_memtest | 13 +-
helpers/lh_binary_syslinux | 222 ++++++++++++---
helpers/lh_binary_yaboot | 26 +-
helpers/make-live | 14 +-
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 +-
45 files changed, 1082 insertions(+), 787 deletions(-)
create mode 100644 debian/changelog.live-package
delete mode 100644 debian/changelog.old
create mode 100644 docs/ChangeLog.live-package
delete mode 100644 docs/ChangeLog.old
diff --git a/Makefile b/Makefile
index 07e821e..37df2f7 100644
--- a/Makefile
+++ b/Makefile
@@ -88,16 +88,16 @@ uninstall:
update:
set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
do \
- sed -i -e 's/2007\\-05\\-07/2007\\-05\\-14/' \
- -e 's/07.05.2007/14.05.2007/' \
- -e 's/1.0~a9/1.0~a10/' \
+ 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/' \
$$MANPAGE; \
done
- sed -i -e 's/1.0~a9/1.0~a10/' functions/common.sh
+ sed -i -e 's/1.0~a10/1.0~a11/' functions/common.sh
- sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch.sh
- sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch+beryl.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
clean:
diff --git a/debian/changelog b/debian/changelog
index d9ac447..d682a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a11-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 21 May 2007 00:00:00 +0200
+
live-helper (1.0~a10-1) unstable; urgency=medium
* New upstream release:
diff --git a/debian/changelog.live-package b/debian/changelog.live-package
new file mode 100644
index 0000000..907eb05
--- /dev/null
+++ b/debian/changelog.live-package
@@ -0,0 +1,208 @@
+live-package (0.99.26-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 9 Mar 2007 12:27:00 +0100
+
+live-package (0.99.25-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 9 Mar 2007 01:49:00 +0100
+
+live-package (0.99.24-1) unstable; urgency=low
+
+ * New upstream release:
+ - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
+ Mathieu Geli <mathieu.geli@gmail.com> (Closes: #412325).
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 3 Mar 2007 12:25:00 +0100
+
+live-package (0.99.23-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 21 Feb 2007 22:08:00 +0100
+
+live-package (0.99.22-1) unstable; urgency=low
+
+ * New upstream release:
+ - updates manpage (Closes: #411008).
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 16 Feb 2007 20:38:00 +0100
+
+live-package (0.99.21-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 12 Feb 2007 15:06:00 +0100
+
+live-package (0.99.20-1) unstable; urgency=low
+
+ * New upstream release:
+ - Fixed manual pruning in minimal flavour as suggested by
+ Bas Wijnen <wijnen@debian.org> (Closes: #410040).
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 1 Feb 2007 17:35:00 +0100
+
+live-package (0.99.19-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 31 Jan 2007 12:38:00 +0100
+
+live-package (0.99.18-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 25 Jan 2007 08:29:00 +0100
+
+live-package (0.99.17-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 24 Jan 2007 22:18:00 +0100
+
+live-package (0.99.16-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 18 Jan 2007 16:25:00 +0100
+
+live-package (0.99.15-1) unstable; urgency=low
+
+ * New upstream release:
+ - switched default distribution back to unstable, as unstable is usable
+ again from the kernel point of view (Closes: #400457).
+ - added file to the minimal package list (Closes: #400485).
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 16 Jan 2007 21:24:00 +0100
+
+live-package (0.99.14-3) unstable; urgency=high
+
+ * Adding workaround for new xorg packages by including xserver-xorg-input-all
+ and xserver-xorg-video-all in all X11 package lists. See #405639 for more
+ information.
+ * Adding xdebconfigurator to all X11 package lists.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 5 Jan 2007 22:34:00 +0100
+
+live-package (0.99.14-2) unstable; urgency=high
+
+ * Adding workaround for initrd backup files (Closes: #404314).
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 4 Jan 2007 20:52:00 +0100
+
+live-package (0.99.14-1) unstable; urgency=medium
+
+ * New upstream release:
+ - fixed typo for policy-rc.d hack (Closes: #396813), thanks to
+ Markus Bauer <bauer-markus@web.de>.
+ - corrected manpage section (Closes: #396083), thanks to
+ Sune Vuorela <reportbug@pusling.com>.
+ - fixes script sourcing to exclude files in .svn (Closes: #396861),
+ thanks to Markus Bauer <bauer-markus@web.de>.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 6 Nov 2006 00:00:00 +0200
+
+live-package (0.99.13-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 30 Oct 2006 00:00:00 +0200
+
+live-package (0.99.12-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
+ (Closes: #394226).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 23 Oct 2006 00:00:00 +0200
+
+live-package (0.99.11-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 16 Oct 2006 00:00:00 +0200
+
+live-package (0.99.10-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 9 Oct 2006 00:00:00 +0200
+
+live-package (0.99.9-1) unstable; urgency=medium
+
+ * New upstream release:
+ - adds support for custom repositories (Closes: #387068).
+ - using proxy for chroot creating too (Closes: #390378).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 2 Oct 2006 00:00:00 +0200
+
+live-package (0.99.8-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 25 Sep 2006 00:00:00 +0200
+
+live-package (0.99.7-1) unstable; urgency=medium
+
+ * New upstream release:
+ - removes the now outdated handling of testing specific kernels
+ (Closes: #387562).
+ - added fix from Bas Wijnen <wijnen@debian.org> for space handling in
+ arguments (Closes: #388204).
+ - fixes package list handling similar to the fix suggested by Alex Owen
+ <r.alex.owen@gmail.com> (Closes: #388060).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 18 Sep 2006 00:00:00 +0200
+
+live-package (0.99.6-1) unstable; urgency=medium
+
+ * New upstream release:
+ - fixing netboot.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 11 Sep 2006 00:00:00 +0200
+
+live-package (0.99.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Set maintainer to the project list.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 4 Sep 2006 00:00:00 +0200
+
+live-package (0.99.4-1) unstable; urgency=low
+
+ * New upstream release:
+ - Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update pxelinux.cfg
+ for NFS root in casper (Closes: #380512).
+ - Temporarily hacks xorg configuration file to remove BusID and set
+ default driver to vesa (Closes: #382391).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 28 Aug 2006 00:00:00 +0200
+
+live-package (0.99.3-1) unstable; urgency=low
+
+ * New upstream release:
+ - fixed configuration file handling (Closes: #384598).
+ * Update long descriptiong (Closes: #382473).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 21 Aug 2006 00:00:00 +0200
+
+live-package (0.99.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 31 Jul 2006 00:00:00 +0200
+
+live-package (0.99.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 24 Jul 2006 00:00:00 +0200
+
+live-package (0.99-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 17 Jul 2006 00:00:00 +0200
diff --git a/debian/changelog.old b/debian/changelog.old
deleted file mode 100644
index 907eb05..0000000
--- a/debian/changelog.old
+++ /dev/null
@@ -1,208 +0,0 @@
-live-package (0.99.26-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Fri, 9 Mar 2007 12:27:00 +0100
-
-live-package (0.99.25-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Fri, 9 Mar 2007 01:49:00 +0100
-
-live-package (0.99.24-1) unstable; urgency=low
-
- * New upstream release:
- - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
- Mathieu Geli <mathieu.geli@gmail.com> (Closes: #412325).
-
- -- Daniel Baumann <daniel@debian.org> Sun, 3 Mar 2007 12:25:00 +0100
-
-live-package (0.99.23-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Wed, 21 Feb 2007 22:08:00 +0100
-
-live-package (0.99.22-1) unstable; urgency=low
-
- * New upstream release:
- - updates manpage (Closes: #411008).
-
- -- Daniel Baumann <daniel@debian.org> Fri, 16 Feb 2007 20:38:00 +0100
-
-live-package (0.99.21-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 12 Feb 2007 15:06:00 +0100
-
-live-package (0.99.20-1) unstable; urgency=low
-
- * New upstream release:
- - Fixed manual pruning in minimal flavour as suggested by
- Bas Wijnen <wijnen@debian.org> (Closes: #410040).
-
- -- Daniel Baumann <daniel@debian.org> Thu, 1 Feb 2007 17:35:00 +0100
-
-live-package (0.99.19-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Wed, 31 Jan 2007 12:38:00 +0100
-
-live-package (0.99.18-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Thu, 25 Jan 2007 08:29:00 +0100
-
-live-package (0.99.17-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Wed, 24 Jan 2007 22:18:00 +0100
-
-live-package (0.99.16-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Thu, 18 Jan 2007 16:25:00 +0100
-
-live-package (0.99.15-1) unstable; urgency=low
-
- * New upstream release:
- - switched default distribution back to unstable, as unstable is usable
- again from the kernel point of view (Closes: #400457).
- - added file to the minimal package list (Closes: #400485).
-
- -- Daniel Baumann <daniel@debian.org> Tue, 16 Jan 2007 21:24:00 +0100
-
-live-package (0.99.14-3) unstable; urgency=high
-
- * Adding workaround for new xorg packages by including xserver-xorg-input-all
- and xserver-xorg-video-all in all X11 package lists. See #405639 for more
- information.
- * Adding xdebconfigurator to all X11 package lists.
-
- -- Daniel Baumann <daniel@debian.org> Fri, 5 Jan 2007 22:34:00 +0100
-
-live-package (0.99.14-2) unstable; urgency=high
-
- * Adding workaround for initrd backup files (Closes: #404314).
-
- -- Daniel Baumann <daniel@debian.org> Thu, 4 Jan 2007 20:52:00 +0100
-
-live-package (0.99.14-1) unstable; urgency=medium
-
- * New upstream release:
- - fixed typo for policy-rc.d hack (Closes: #396813), thanks to
- Markus Bauer <bauer-markus@web.de>.
- - corrected manpage section (Closes: #396083), thanks to
- Sune Vuorela <reportbug@pusling.com>.
- - fixes script sourcing to exclude files in .svn (Closes: #396861),
- thanks to Markus Bauer <bauer-markus@web.de>.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 6 Nov 2006 00:00:00 +0200
-
-live-package (0.99.13-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 30 Oct 2006 00:00:00 +0200
-
-live-package (0.99.12-1) unstable; urgency=medium
-
- * New upstream release.
- - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
- (Closes: #394226).
-
- -- Daniel Baumann <daniel@debian.org> Mon, 23 Oct 2006 00:00:00 +0200
-
-live-package (0.99.11-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 16 Oct 2006 00:00:00 +0200
-
-live-package (0.99.10-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 9 Oct 2006 00:00:00 +0200
-
-live-package (0.99.9-1) unstable; urgency=medium
-
- * New upstream release:
- - adds support for custom repositories (Closes: #387068).
- - using proxy for chroot creating too (Closes: #390378).
-
- -- Daniel Baumann <daniel@debian.org> Mon, 2 Oct 2006 00:00:00 +0200
-
-live-package (0.99.8-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 25 Sep 2006 00:00:00 +0200
-
-live-package (0.99.7-1) unstable; urgency=medium
-
- * New upstream release:
- - removes the now outdated handling of testing specific kernels
- (Closes: #387562).
- - added fix from Bas Wijnen <wijnen@debian.org> for space handling in
- arguments (Closes: #388204).
- - fixes package list handling similar to the fix suggested by Alex Owen
- <r.alex.owen@gmail.com> (Closes: #388060).
-
- -- Daniel Baumann <daniel@debian.org> Mon, 18 Sep 2006 00:00:00 +0200
-
-live-package (0.99.6-1) unstable; urgency=medium
-
- * New upstream release:
- - fixing netboot.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 11 Sep 2006 00:00:00 +0200
-
-live-package (0.99.5-1) unstable; urgency=low
-
- * New upstream release.
- * Set maintainer to the project list.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 4 Sep 2006 00:00:00 +0200
-
-live-package (0.99.4-1) unstable; urgency=low
-
- * New upstream release:
- - Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update pxelinux.cfg
- for NFS root in casper (Closes: #380512).
- - Temporarily hacks xorg configuration file to remove BusID and set
- default driver to vesa (Closes: #382391).
-
- -- Daniel Baumann <daniel@debian.org> Mon, 28 Aug 2006 00:00:00 +0200
-
-live-package (0.99.3-1) unstable; urgency=low
-
- * New upstream release:
- - fixed configuration file handling (Closes: #384598).
- * Update long descriptiong (Closes: #382473).
-
- -- Daniel Baumann <daniel@debian.org> Mon, 21 Aug 2006 00:00:00 +0200
-
-live-package (0.99.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 31 Jul 2006 00:00:00 +0200
-
-live-package (0.99.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 24 Jul 2006 00:00:00 +0200
-
-live-package (0.99-1) unstable; urgency=low
-
- * Initial release.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 17 Jul 2006 00:00:00 +0200
diff --git a/debian/rules b/debian/rules
index a635706..3946bc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,14 +25,14 @@ install: build
# Installing package
$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
- install -D -m 0644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
+ install -D -m 0644 debian/changelog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.Debian.live-package
install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
# Removing double files
rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
- mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old debian/live-helper/usr/share/doc/live-helper/changelog.old
+ mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package
binary-arch: build install
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 6ae509c..d44af87 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-24 Daniel Baumann <daniel@debian.org>
+
+ * helpers/lh_binary_syslinux:
+ - Added dedicated directory handling for syslinux (>= 3.36) on usb.
+ * helpers/lh_binary_debian-installer, lh_binary_linux-image,
+ lh_binary_memtest, lh_binary_syslinux:
+ - Added legacy support for syslinux (<< 3.36).
+ * Uploaded 1.0~a11-1.
+
2007-05-18 Daniel Baumann <daniel@debian.org>
* helpers/*:
diff --git a/docs/ChangeLog.live-package b/docs/ChangeLog.live-package
new file mode 100644
index 0000000..03dba64
--- /dev/null
+++ b/docs/ChangeLog.live-package
@@ -0,0 +1,474 @@
+2007-03-10 Daniel Baumann <daniel@debian.org>
+
+ * Added knoppix and knoppix-dvd package lists.
+
+2007-03-09 Daniel Baumann <daniel@debian.org>
+
+ * Getting free loopdevice from inside the chroot, not outside.
+
+2007-03-09 Daniel Baumann <daniel@debian.org>
+
+ * Added kbd to all !minimal lists.
+ * Uploaded 0.99.25.
+
+2007-03-08 Otavio Salvador <otavio@debian.org>
+
+ * helpers/lh_configapt: Fix aptitude configuration to really avoid
+ recommended packages to get installed.
+ * src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
+
+2007-03-04 Daniel Baumann <daniel@debian.org>
+
+ * Replaced removal of kernel on minimal flavours with excludes on the
+ mksquashfs call.
+ * Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
+ by Mathieu Geli <mathieu.geli@gmail.com>.
+ * Exported CODENAME_* manually as reported by Cédric Lucantis
+ <omer@no-log.org>.
+ * Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
+ <hendry@iki.fi>.
+ * Uploaded 0.99.24.
+
+2007-02-22 Daniel Baumann <daniel@debian.org>
+
+ * Added xresprobe to all x11 lists.
+
+2007-02-22 Daniel Baumann <daniel@debian.org>
+
+ * Applied patches from Otavio Salvador <otavio@debian.org>:
+ - add and cleanup variable exporting in defaults.
+ - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
+ * Uploaded 0.99.23.
+
+2007-02-21 Daniel Baumann <daniel@debian.org>
+
+ * Added gnome-junior, kde-junior and xfce-junior lists.
+ * Uploaded 0.99.22.
+
+2007-02-19 Daniel Baumann <daniel@debian.org>
+
+ * Fixed manifest.
+
+2007-02-15 Daniel Baumann <daniel@debian.org>
+
+ * Applied patch from Sebastian Raveau <sebastien.raveau@epita.fr> to
+ add support for filesystem images encrypted with loop-aes.
+
+2007-02-13 Daniel Baumann <daniel@debian.org>
+
+ * Broken out scripts into modularized lh_* subscripts.
+
+2007-02-12 Daniel Baumann <daniel@debian.org>
+
+ * Added some code as suggested by Alex Owen <r.a.owen@qmul.ac.uk> to
+ check if the depends (syslinux, memtest etc.) are intentionally
+ installed in the chroot, and hence, don't remove them.
+ * Moved some depends into the chroot.
+ * Uploaded 0.99.21.
+
+2007-02-11 Daniel Baumann <daniel@debian.org>
+
+ * Added mini flavour.
+
+2007-02-10 Daniel Baumann <daniel@debian.org>
+
+ * Added legacy code for genisoimage.
+ * Uploaded 0.99.20.
+
+2007-02-09 Daniel Baumann <daniel@debian.org>
+
+ * Added usb type.
+
+2007-02-08 Daniel Baumann <daniel@debian.org>
+
+ * Added desktop task to the *-desktop flavours.
+
+2007-02-07 Daniel Baumann <daniel@debian.org>
+
+ * Extended cron job a bit.
+ * Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
+ <wijnen@debian.org>
+
+2007-02-02 Daniel Baumann <daniel@debian.org>
+
+ * Added "--without-daemons".
+
+2007-02-01 Daniel Baumann <daniel@debian.org>
+
+ * Added "--tasks".
+ * Added desktop-base to all desktop package lists.
+
+2007-01-31 Daniel Baumann <daniel@debian.org>
+
+ * Changed vars in autobuilding script to be able to source
+ make-live.conf.
+ * Uploaded 0.99.19.
+
+2007-01-30 Daniel Baumann <daniel@debian.org>
+
+ * Added cron job for autobuilding images.
+
+2007-01-25 Daniel Baumann <daniel@debian.org>
+
+ * Added additional pruning to minimal flavour.
+ * Using interactive frontend while processing --hook.
+ * Uploaded 0.99.18.
+
+2007-01-24 Daniel Baumann <daniel@debian.org>
+
+ * Applied patches from Otavio Salvador <otavio@debian.org>:
+ - adding "--keyring" flag.
+ - adding LIVE_DISK_VOLUME.
+ - adding start-stop-daemon wrapper to avoid daemons to be started.
+ - adding workaround to prevent binfmt locking /proc.
+ - adding LIVE_ISOLINUX_SPLASH.
+ * Uploaded 0.99.17.
+
+2007-01-19 Daniel Baumann <daniel@debian.org>
+
+ * Replacing mkisofs with genisoimage.
+
+2007-01-18 Daniel Baumann <daniel@debian.org>
+
+ * Cleanups.
+ * Uploaded 0.99.16.
+
+2007-01-16 Daniel Baumann <daniel@debian.org>
+
+ * Switched default distribution back to unstable, as unstable is usable
+ again from the kernel point of view.
+ * Added file to the minimal package list.
+ * Uploaded 0.99.15.
+
+2007-01-04 Daniel Baumann <daniel@debian.org>
+
+ * Added workaround for new xorg packages by including
+ xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
+ lists. See #405639 for more information.
+ * Added xdebconfigurator to all X11 package lists.
+ * Adding workaround for initrd backup files.
+
+2006-11-06 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.14.
+
+2006-11-05 Daniel Baumann <daniel@debian.org>
+
+ * Applied patch from Markus Bauer <bauer-markus@web.de>:
+ - fixing script sourcing to exclude files in .svn
+
+2006-11-03 Daniel Baumann <daniel@debian.org>
+
+ * Fixed typo in the policy-rc.d hack.
+
+2006-11-02 Daniel Baumann <daniel@debian.org>
+
+ * Using aptitude instead of apt-get.
+ * Added '--with-recommends' and '--without-recommends'.
+
+2006-11-01 Daniel Baumann <daniel@debian.org>
+
+ * Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
+
+2006-10-30 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.13.
+
+2006-10-29 Daniel Baumann <daniel@debian.org>
+
+ * Added minimal-net flavour.
+
+2006-10-28 Daniel Baumann <daniel@debian.org>
+
+ * Added console-common to standard selection.
+
+2006-10-27 Daniel Baumann <daniel@debian.org>
+
+ * Added patch from Otavio Salvador <otavio@debian.org>:
+ - fixing preseeding error-handling.
+
+2006-10-26 Daniel Baumann <daniel@debian.org>
+
+ * Added gnustep package selection based on the suggestion of
+ Guerkan Senguen <gurkan@linuks.mine.nu>.
+
+2006-10-25 Daniel Baumann <daniel@debian.org>
+
+ * Applied patch from Marcelo D. Re <mdre@rectorado.unl.edu.ar>:
+ - skip deb-src source-list entries when building images with
+ --without-source.
+ * Applied patches from Otavio Salvador <otavio@debian.org>:
+ - adding '--bootstrap-config' to support cdebootstraps
+ '--suite-config'.
+ - allowing override of ${BASE}.
+ - adjust sourcing of scripts, so that only the real scripts are
+ sourced and not other (backup) files.
+ - allowing override of kernel-packages.
+ * Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
+
+2006-10-23 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.12.
+
+2006-10-18 Daniel Baumann <daniel@debian.org>
+
+ * Autodetecting proxy now.
+
+2006-10-16 Daniel Baumann <daniel@debian.org>
+
+ * Readded and slightly changed --clone and --preseed.
+ * Uploaded 0.99.11.
+
+2006-10-09 Daniel Baumann <daniel@debian.org>
+
+ * Cleanups.
+ * Uploaded 0.99.10.
+
+2006-10-02 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.9.
+
+2006-10-01 Daniel Baumann <daniel@debian.org>
+
+ * Added multiple repositories.
+ * Using LIVE_PROXY_* also for bootstraping.
+
+2006-09-27 Daniel Baumann <daniel@debian.org>
+
+ * Changing manpage section.
+
+2006-09-26 Daniel Baumann <daniel@debian.org>
+
+ * Added default flavour hooks.
+ * minimal flavour does not install debian-archive-keyring to save space.
+ * Adjusted network patch.
+
+2006-09-25 Daniel Baumann <daniel@debian.org>
+
+ * Removed now unused initramfs-tools hack.
+ * Simplified xorg check based on distribution rather than version.
+ * Added fix from Bas Wijnen <wijnen@debian.org> for space handling in
+ arguments.
+ * Fixed package list handling similar to the fix suggested by Alex Owen
+ <r.alex.owen@gmail.com>.
+ * Uploaded 0.99.8.
+
+2006-09-24 Marco Amadori <marco.amadori@gmail.com>
+
+ * 13hack.sh: initramfs-tools hack, check added for xorg.
+
+2006-09-18 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.7.
+
+2006-09-15 Daniel Baumann <daniel@debian.org>
+
+ * Added eject to minimal package selection.
+
+2006-09-14 Daniel Baumann <daniel@debian.org>
+
+ * Adjustements for linux 2.6.17 testing propagation.
+
+2006-09-11 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.6.
+
+2006-09-08 Marco Amadori <marco.amadori@gmail.com>
+
+ * 23net.sh: Fixed binary missing directory creation.
+ * templates/iso: Moved common files to templates/common.
+
+2006-09-07 Daniel Baumann <daniel@debian.org>
+
+ * Minor cleanups.
+ * Fixed dist target.
+
+2006-09-06 Marco Amadori <marco.amadori@gmail.com>
+
+ * 14chroot.sh, main.sh: Added manifest support.
+ * 23net.sh: Added 2 variables for basenames to ease readability.
+ * main.sh, 02default.sh: Modified Usage() uses.
+
+2006-09-04 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.5.
+
+2006-09-03 Daniel Baumann <daniel@debian.org>
+
+ * Added dist parameter to easily pull images for live.debian.net.
+ * Added "--output" to specify the image name prefix.
+ * Exclude iso templates for minimal flavour.
+
+2006-09-02 Daniel Baumann <daniel@debian.org>
+
+ * Added experimental as distribution.
+ * Added source image generation.
+ * Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
+
+2006-08-31 Daniel Baumann <daniel@debian.org>
+
+ * Added "--disable-generic-indices" and "--enable-generic-indices".
+ * Fixed i18n lists.
+ * Rewritten all lists, comments are now possible.
+ * Lists must be now explicitly given with --package-list, no longer as
+ last argument of the make-live call.
+ * Setting default sources.list while the image generation, restoring
+ customized ones afterwards.
+
+2006-08-30 Daniel Baumann <daniel@debian.org>
+
+ * Cleanups:
+ - moved 14patch_packages.sh to 13hack.sh.
+ - simplified 13hack.sh.
+
+2006-08-29 Marco Amadori <marco.amadori@gmail.com>
+
+ * pxelinux.cfg: Updated to right defaults, first cifs then nfs or
+ select your favorite way. Rationale: /dev/nfs is for kernel
+ discovering, not for initramfs discover, casper will be just fine
+ with "netboot".
+ * 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
+ packages, mainly for xserver-xorg so far.
+
+2006-08-28 Daniel Baumann <daniel@debian.org>
+
+ * Updated documentation.
+ * Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update
+ pxelinux.cfg for NFS root in casper.
+ * Uploaded 0.99.4.
+
+2006-08-27 Daniel Baumann <daniel@debian.org>
+
+ * Cleanups.
+
+2006-08-27 Marco Amadori <marco.amadori@gmail.com>
+
+ * Added sysv init blocking policy.
+
+2006-08-22 Daniel Baumann <daniel@debian.org>
+
+ * Reorganised sources.
+ * Added staging support.
+ * Cleaned up parameter names.
+ * testing is now supported.
+
+2006-08-21 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.3.
+
+2006-08-02 Marco Amadori <marco.amadori@gmail.com>
+
+ * Rewrote netboot support.
+ * Added support for pure directory rootfs images.
+
+2006-07-31 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.2.
+
+2006-07-28 Daniel Baumann <daniel@debian.org>
+
+ * Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
+ * Fixed wrong chroot patch.
+
+2006-07-27 Marco Amadori <marco.amadori@gmail.com>
+
+ * Changed amd64 kernel naming scheme.
+
+2006-07-24 Daniel Baumann <daniel@debian.org>
+
+ * Uploaded 0.99.1.
+
+2006-07-19 Daniel Baumann <daniel@debian.org>
+
+ * Bugfixes.
+
+2006-07-18 Daniel Baumann <daniel@debian.org>
+
+ * Added iso templates.
+
+2006-07-17 Daniel Baumann <daniel@debian.org>
+
+ * Added chroot to 01-patch.sh.
+ * Added "--logfile".
+ * Uploaded 0.99.
+
+2006-07-01 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Added "--flavour".
+
+2006-06-28 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Added "--debug" and "--verbose".
+
+2006-06-23 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Rewritten manpages.
+
+2006-06-19 Marco Amadori <marco.amadori@gmail.com>
+
+ * Added "--templates" options.
+ * Fixed some typos.
+
+2006-06-15 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * General fixes.
+
+2006-06-18 Marco Amadori <marco.amadori@gmail.com>
+
+ * Added "-a|--architecture" and "-p|--package-list" options.
+ * Reworked how lists works.
+
+2006-06-15 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * General cleanup.
+
+2006-06-14 Marco Amadori <marco.amadori@gmail.com>
+
+ * Re-added "-f|--filesystem".
+
+2006-06-12 Marco Amadori <marco.amadori@gmail.com>
+
+ * Added "--conffile", "--preseed", "--clone", and "--rootfs" options.
+
+2006-06-12 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Added new splash.rle.
+ * Added memtest86+.
+ * Added "--distribution", and "--section" options.
+ * Moved /etc/default/make-live to /etc/make-live.conf.
+
+2006-06-11 Marco Amadori <marco.amadori@gmail.com>
+
+ * Added handling of md5sums.
+
+2006-06-09 Marco Amadori <marco.amadori@gmail.com>
+
+ * Added splashy support.
+ * Added ext2 rootfs support.
+ * Added external hook and path support.
+ * Swiched to getopt.
+
+2006-06-02 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Added patch from Jason D. Clinton <me@jasonclinton.com>:
+ - Added netboot flavour.
+ - Thanks to SafeDesk Solutions <http://www.safedesk.com/>.
+
+2006-06-01 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Moved syslinux inside the chroot.
+
+2006-05-31 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Added kde-*i18n and standard-i18n lists.
+
+2006-05-28 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Added patch from Frederic Lehobey <Frederic.Lehobey@free.fr>:
+ - Added locales to LIVE_PACKAGES.
+ - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and
+ LIVE_BOOTAPPEND.
+
+2006-05-27 Daniel Baumann <daniel.baumann@panthera-systems.net>
+
+ * Initial release.
diff --git a/docs/ChangeLog.old b/docs/ChangeLog.old
deleted file mode 100644
index 03dba64..0000000
--- a/docs/ChangeLog.old
+++ /dev/null
@@ -1,474 +0,0 @@
-2007-03-10 Daniel Baumann <daniel@debian.org>
-
- * Added knoppix and knoppix-dvd package lists.
-
-2007-03-09 Daniel Baumann <daniel@debian.org>
-
- * Getting free loopdevice from inside the chroot, not outside.
-
-2007-03-09 Daniel Baumann <daniel@debian.org>
-
- * Added kbd to all !minimal lists.
- * Uploaded 0.99.25.
-
-2007-03-08 Otavio Salvador <otavio@debian.org>
-
- * helpers/lh_configapt: Fix aptitude configuration to really avoid
- recommended packages to get installed.
- * src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
-
-2007-03-04 Daniel Baumann <daniel@debian.org>
-
- * Replaced removal of kernel on minimal flavours with excludes on the
- mksquashfs call.
- * Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
- by Mathieu Geli <mathieu.geli@gmail.com>.
- * Exported CODENAME_* manually as reported by Cédric Lucantis
- <omer@no-log.org>.
- * Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
- <hendry@iki.fi>.
- * Uploaded 0.99.24.
-
-2007-02-22 Daniel Baumann <daniel@debian.org>
-
- * Added xresprobe to all x11 lists.
-
-2007-02-22 Daniel Baumann <daniel@debian.org>
-
- * Applied patches from Otavio Salvador <otavio@debian.org>:
- - add and cleanup variable exporting in defaults.
- - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
- * Uploaded 0.99.23.
-
-2007-02-21 Daniel Baumann <daniel@debian.org>
-
- * Added gnome-junior, kde-junior and xfce-junior lists.
- * Uploaded 0.99.22.
-
-2007-02-19 Daniel Baumann <daniel@debian.org>
-
- * Fixed manifest.
-
-2007-02-15 Daniel Baumann <daniel@debian.org>
-
- * Applied patch from Sebastian Raveau <sebastien.raveau@epita.fr> to
- add support for filesystem images encrypted with loop-aes.
-
-2007-02-13 Daniel Baumann <daniel@debian.org>
-
- * Broken out scripts into modularized lh_* subscripts.
-
-2007-02-12 Daniel Baumann <daniel@debian.org>
-
- * Added some code as suggested by Alex Owen <r.a.owen@qmul.ac.uk> to
- check if the depends (syslinux, memtest etc.) are intentionally
- installed in the chroot, and hence, don't remove them.
- * Moved some depends into the chroot.
- * Uploaded 0.99.21.
-
-2007-02-11 Daniel Baumann <daniel@debian.org>
-
- * Added mini flavour.
-
-2007-02-10 Daniel Baumann <daniel@debian.org>
-
- * Added legacy code for genisoimage.
- * Uploaded 0.99.20.
-
-2007-02-09 Daniel Baumann <daniel@debian.org>
-
- * Added usb type.
-
-2007-02-08 Daniel Baumann <daniel@debian.org>
-
- * Added desktop task to the *-desktop flavours.
-
-2007-02-07 Daniel Baumann <daniel@debian.org>
-
- * Extended cron job a bit.
- * Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
- <wijnen@debian.org>
-
-2007-02-02 Daniel Baumann <daniel@debian.org>
-
- * Added "--without-daemons".
-
-2007-02-01 Daniel Baumann <daniel@debian.org>
-
- * Added "--tasks".
- * Added desktop-base to all desktop package lists.
-
-2007-01-31 Daniel Baumann <daniel@debian.org>
-
- * Changed vars in autobuilding script to be able to source
- make-live.conf.
- * Uploaded 0.99.19.
-
-2007-01-30 Daniel Baumann <daniel@debian.org>
-
- * Added cron job for autobuilding images.
-
-2007-01-25 Daniel Baumann <daniel@debian.org>
-
- * Added additional pruning to minimal flavour.
- * Using interactive frontend while processing --hook.
- * Uploaded 0.99.18.
-
-2007-01-24 Daniel Baumann <daniel@debian.org>
-
- * Applied patches from Otavio Salvador <otavio@debian.org>:
- - adding "--keyring" flag.
- - adding LIVE_DISK_VOLUME.
- - adding start-stop-daemon wrapper to avoid daemons to be started.
- - adding workaround to prevent binfmt locking /proc.
- - adding LIVE_ISOLINUX_SPLASH.
- * Uploaded 0.99.17.
-
-2007-01-19 Daniel Baumann <daniel@debian.org>
-
- * Replacing mkisofs with genisoimage.
-
-2007-01-18 Daniel Baumann <daniel@debian.org>
-
- * Cleanups.
- * Uploaded 0.99.16.
-
-2007-01-16 Daniel Baumann <daniel@debian.org>
-
- * Switched default distribution back to unstable, as unstable is usable
- again from the kernel point of view.
- * Added file to the minimal package list.
- * Uploaded 0.99.15.
-
-2007-01-04 Daniel Baumann <daniel@debian.org>
-
- * Added workaround for new xorg packages by including
- xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
- lists. See #405639 for more information.
- * Added xdebconfigurator to all X11 package lists.
- * Adding workaround for initrd backup files.
-
-2006-11-06 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.14.
-
-2006-11-05 Daniel Baumann <daniel@debian.org>
-
- * Applied patch from Markus Bauer <bauer-markus@web.de>:
- - fixing script sourcing to exclude files in .svn
-
-2006-11-03 Daniel Baumann <daniel@debian.org>
-
- * Fixed typo in the policy-rc.d hack.
-
-2006-11-02 Daniel Baumann <daniel@debian.org>
-
- * Using aptitude instead of apt-get.
- * Added '--with-recommends' and '--without-recommends'.
-
-2006-11-01 Daniel Baumann <daniel@debian.org>
-
- * Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
-
-2006-10-30 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.13.
-
-2006-10-29 Daniel Baumann <daniel@debian.org>
-
- * Added minimal-net flavour.
-
-2006-10-28 Daniel Baumann <daniel@debian.org>
-
- * Added console-common to standard selection.
-
-2006-10-27 Daniel Baumann <daniel@debian.org>
-
- * Added patch from Otavio Salvador <otavio@debian.org>:
- - fixing preseeding error-handling.
-
-2006-10-26 Daniel Baumann <daniel@debian.org>
-
- * Added gnustep package selection based on the suggestion of
- Guerkan Senguen <gurkan@linuks.mine.nu>.
-
-2006-10-25 Daniel Baumann <daniel@debian.org>
-
- * Applied patch from Marcelo D. Re <mdre@rectorado.unl.edu.ar>:
- - skip deb-src source-list entries when building images with
- --without-source.
- * Applied patches from Otavio Salvador <otavio@debian.org>:
- - adding '--bootstrap-config' to support cdebootstraps
- '--suite-config'.
- - allowing override of ${BASE}.
- - adjust sourcing of scripts, so that only the real scripts are
- sourced and not other (backup) files.
- - allowing override of kernel-packages.
- * Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
-
-2006-10-23 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.12.
-
-2006-10-18 Daniel Baumann <daniel@debian.org>
-
- * Autodetecting proxy now.
-
-2006-10-16 Daniel Baumann <daniel@debian.org>
-
- * Readded and slightly changed --clone and --preseed.
- * Uploaded 0.99.11.
-
-2006-10-09 Daniel Baumann <daniel@debian.org>
-
- * Cleanups.
- * Uploaded 0.99.10.
-
-2006-10-02 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.9.
-
-2006-10-01 Daniel Baumann <daniel@debian.org>
-
- * Added multiple repositories.
- * Using LIVE_PROXY_* also for bootstraping.
-
-2006-09-27 Daniel Baumann <daniel@debian.org>
-
- * Changing manpage section.
-
-2006-09-26 Daniel Baumann <daniel@debian.org>
-
- * Added default flavour hooks.
- * minimal flavour does not install debian-archive-keyring to save space.
- * Adjusted network patch.
-
-2006-09-25 Daniel Baumann <daniel@debian.org>
-
- * Removed now unused initramfs-tools hack.
- * Simplified xorg check based on distribution rather than version.
- * Added fix from Bas Wijnen <wijnen@debian.org> for space handling in
- arguments.
- * Fixed package list handling similar to the fix suggested by Alex Owen
- <r.alex.owen@gmail.com>.
- * Uploaded 0.99.8.
-
-2006-09-24 Marco Amadori <marco.amadori@gmail.com>
-
- * 13hack.sh: initramfs-tools hack, check added for xorg.
-
-2006-09-18 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.7.
-
-2006-09-15 Daniel Baumann <daniel@debian.org>
-
- * Added eject to minimal package selection.
-
-2006-09-14 Daniel Baumann <daniel@debian.org>
-
- * Adjustements for linux 2.6.17 testing propagation.
-
-2006-09-11 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.6.
-
-2006-09-08 Marco Amadori <marco.amadori@gmail.com>
-
- * 23net.sh: Fixed binary missing directory creation.
- * templates/iso: Moved common files to templates/common.
-
-2006-09-07 Daniel Baumann <daniel@debian.org>
-
- * Minor cleanups.
- * Fixed dist target.
-
-2006-09-06 Marco Amadori <marco.amadori@gmail.com>
-
- * 14chroot.sh, main.sh: Added manifest support.
- * 23net.sh: Added 2 variables for basenames to ease readability.
- * main.sh, 02default.sh: Modified Usage() uses.
-
-2006-09-04 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.5.
-
-2006-09-03 Daniel Baumann <daniel@debian.org>
-
- * Added dist parameter to easily pull images for live.debian.net.
- * Added "--output" to specify the image name prefix.
- * Exclude iso templates for minimal flavour.
-
-2006-09-02 Daniel Baumann <daniel@debian.org>
-
- * Added experimental as distribution.
- * Added source image generation.
- * Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
-
-2006-08-31 Daniel Baumann <daniel@debian.org>
-
- * Added "--disable-generic-indices" and "--enable-generic-indices".
- * Fixed i18n lists.
- * Rewritten all lists, comments are now possible.
- * Lists must be now explicitly given with --package-list, no longer as
- last argument of the make-live call.
- * Setting default sources.list while the image generation, restoring
- customized ones afterwards.
-
-2006-08-30 Daniel Baumann <daniel@debian.org>
-
- * Cleanups:
- - moved 14patch_packages.sh to 13hack.sh.
- - simplified 13hack.sh.
-
-2006-08-29 Marco Amadori <marco.amadori@gmail.com>
-
- * pxelinux.cfg: Updated to right defaults, first cifs then nfs or
- select your favorite way. Rationale: /dev/nfs is for kernel
- discovering, not for initramfs discover, casper will be just fine
- with "netboot".
- * 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
- packages, mainly for xserver-xorg so far.
-
-2006-08-28 Daniel Baumann <daniel@debian.org>
-
- * Updated documentation.
- * Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update
- pxelinux.cfg for NFS root in casper.
- * Uploaded 0.99.4.
-
-2006-08-27 Daniel Baumann <daniel@debian.org>
-
- * Cleanups.
-
-2006-08-27 Marco Amadori <marco.amadori@gmail.com>
-
- * Added sysv init blocking policy.
-
-2006-08-22 Daniel Baumann <daniel@debian.org>
-
- * Reorganised sources.
- * Added staging support.
- * Cleaned up parameter names.
- * testing is now supported.
-
-2006-08-21 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.3.
-
-2006-08-02 Marco Amadori <marco.amadori@gmail.com>
-
- * Rewrote netboot support.
- * Added support for pure directory rootfs images.
-
-2006-07-31 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.2.
-
-2006-07-28 Daniel Baumann <daniel@debian.org>
-
- * Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
- * Fixed wrong chroot patch.
-
-2006-07-27 Marco Amadori <marco.amadori@gmail.com>
-
- * Changed amd64 kernel naming scheme.
-
-2006-07-24 Daniel Baumann <daniel@debian.org>
-
- * Uploaded 0.99.1.
-
-2006-07-19 Daniel Baumann <daniel@debian.org>
-
- * Bugfixes.
-
-2006-07-18 Daniel Baumann <daniel@debian.org>
-
- * Added iso templates.
-
-2006-07-17 Daniel Baumann <daniel@debian.org>
-
- * Added chroot to 01-patch.sh.
- * Added "--logfile".
- * Uploaded 0.99.
-
-2006-07-01 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Added "--flavour".
-
-2006-06-28 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Added "--debug" and "--verbose".
-
-2006-06-23 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Rewritten manpages.
-
-2006-06-19 Marco Amadori <marco.amadori@gmail.com>
-
- * Added "--templates" options.
- * Fixed some typos.
-
-2006-06-15 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * General fixes.
-
-2006-06-18 Marco Amadori <marco.amadori@gmail.com>
-
- * Added "-a|--architecture" and "-p|--package-list" options.
- * Reworked how lists works.
-
-2006-06-15 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * General cleanup.
-
-2006-06-14 Marco Amadori <marco.amadori@gmail.com>
-
- * Re-added "-f|--filesystem".
-
-2006-06-12 Marco Amadori <marco.amadori@gmail.com>
-
- * Added "--conffile", "--preseed", "--clone", and "--rootfs" options.
-
-2006-06-12 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Added new splash.rle.
- * Added memtest86+.
- * Added "--distribution", and "--section" options.
- * Moved /etc/default/make-live to /etc/make-live.conf.
-
-2006-06-11 Marco Amadori <marco.amadori@gmail.com>
-
- * Added handling of md5sums.
-
-2006-06-09 Marco Amadori <marco.amadori@gmail.com>
-
- * Added splashy support.
- * Added ext2 rootfs support.
- * Added external hook and path support.
- * Swiched to getopt.
-
-2006-06-02 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Added patch from Jason D. Clinton <me@jasonclinton.com>:
- - Added netboot flavour.
- - Thanks to SafeDesk Solutions <http://www.safedesk.com/>.
-
-2006-06-01 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Moved syslinux inside the chroot.
-
-2006-05-31 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Added kde-*i18n and standard-i18n lists.
-
-2006-05-28 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Added patch from Frederic Lehobey <Frederic.Lehobey@free.fr>:
- - Added locales to LIVE_PACKAGES.
- - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and
- LIVE_BOOTAPPEND.
-
-2006-05-27 Daniel Baumann <daniel.baumann@panthera-systems.net>
-
- * Initial release.
diff --git a/docs/NEWS b/docs/NEWS
index 7a7be26..4032f4b 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -38,3 +38,7 @@ News:
* 2007-04-30: Uploaded first live-initramfs to Debian unstable.
http://packages.debian.org/changelogs/pool/main/l/live-initramfs/current/changelog#versionversion1.87.1-1
+
+ * 2007-05-24: casper is dead, long lives live-initramfs.
+ http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-May/001392.html
+ http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-May/001393.html
diff --git a/docs/TODO b/docs/TODO
index 780925f..12e03b1 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,8 +4,7 @@ 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~a11-1:
- * add compat code for old syslinux
+1.0~a12-1:
* reordering content of configuration files
ALPHA series:
diff --git a/examples/cron/daily.sh b/examples/cron/daily.sh
index 3d93a33..ef55099 100755
--- a/examples/cron/daily.sh
+++ b/examples/cron/daily.sh
@@ -11,7 +11,7 @@ DATE="`date +%Y%m%d`"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
-OPTIONS="--binary-indices disabled"
+OPTIONS="--binary-indices disabled --initramfs live-initramfs"
ARCHITECTURES="`dpkg --print-architecture`"
DISTRIBUTIONS="sid"
diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh
index a3d3def..a51bf01 100755
--- a/examples/cron/etch+beryl.sh
+++ b/examples/cron/etch+beryl.sh
@@ -7,11 +7,11 @@ BUILD="etch+beryl"
# Begin custom defaults
AUTOBUILD="enabled"
-DATE="r0_1.0~a10-1"
+DATE="r0_1.0~a11-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
-OPTIONS="--binary-indices disabled"
+OPTIONS="--binary-indices disabled --initramfs casper"
ARCHITECTURES="`dpkg --print-architecture`"
DISTRIBUTIONS="etch"
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index a53452c..3bf2afd 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -7,11 +7,11 @@ BUILD="etch"
# Begin custom defaults
AUTOBUILD="enabled"
-DATE="r0_1.0~a10-1"
+DATE="r0_1.0~a11-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
-OPTIONS="--binary-indices disabled"
+OPTIONS="--binary-indices disabled --initramfs casper"
ARCHITECTURES="`dpkg --print-architecture`"
DISTRIBUTIONS="etch"
diff --git a/examples/cron/weekly.sh b/examples/cron/weekly.sh
index 98bd7ff..d3f9d79 100755
--- a/examples/cron/weekly.sh
+++ b/examples/cron/weekly.sh
@@ -11,7 +11,7 @@ DATE="`date +%Y%m%d`"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"
-OPTIONS="--binary-indices disabled"
+OPTIONS="--binary-indices disabled --initramfs casper"
ARCHITECTURES="`dpkg --print-architecture`"
DISTRIBUTIONS="lenny"
diff --git a/functions/common.sh b/functions/common.sh
index d97ce04..c4c361d 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
-VERSION="1.0~a10"
+VERSION="1.0~a11"
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 0344303..a14beda 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -67,7 +67,19 @@ case "${LIVE_BINARY_IMAGES}" in
;;
usb-hdd|hdd)
- DESTDIR="binary/install"
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/install"
+ fi
+ else
+ DESTDIR="binary/install"
+ fi
+
DESTDIR_INSTALLER="hd-media"
;;
esac
@@ -97,16 +109,58 @@ fi
# Downloading debian-installer
mkdir -p "${DESTDIR}"
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ fi
+ else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ fi
+else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+fi
# Downloading graphical-installer
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
- mkdir -p "${DESTDIR}"/gtk
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+ else
+ mkdir -p "${DESTDIR}"/gtk
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
fi
FIXME ()
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 6476f0c..c72b0f0 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -138,12 +138,34 @@ fi
if [ -n "${LIVE_USERNAME}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ case "${LH_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_USERNAME}" != "user" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ fi
+ ;;
+ esac
fi
if [ -n "${LIVE_HOSTNAME}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ case "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
fi
LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
@@ -181,13 +203,32 @@ then
LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
fi
# Assembling memtest configuration
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 92b6a68..6a1f5b3 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -106,7 +106,7 @@ then
fi
# Adjusting d-i templates
- DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+ DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
if [ "${LIVE_ARCHITECTURE}" = "i386" ]
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index c7e5dd6..b7349d9 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -60,7 +60,18 @@ case "${LIVE_BINARY_IMAGES}" in
;;
usb-hdd|hdd)
- DESTDIR="binary/live"
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/live"
+ fi
+ else
+ DESTDIR="binary/live"
+ fi
;;
esac
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index eedc054..a96dbc5 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -82,7 +82,18 @@ case "${LIVE_BINARY_IMAGES}" in
;;
usb-hdd|hdd)
- DESTDIR="binary/live"
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/live"
+ fi
+ else
+ DESTDIR="binary/live"
+ fi
;;
esac
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index ea78c86..124cb36 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -104,8 +104,15 @@ case "${LIVE_BINARY_IMAGES}" in
;;
usb-hdd|hdd)
- DESTDIR_LIVE="binary/live"
- DESTDIR_INSTALL="binary/install"
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ DESTDIR_LIVE="binary"
+ DESTDIR_INSTALL="binary"
+ else
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
+ fi
;;
esac
@@ -143,12 +150,34 @@ fi
if [ -n "${LIVE_USERNAME}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ case "${LH_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_USERNAME}" != "user" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ fi
+ ;;
+ esac
fi
if [ -n "${LIVE_HOSTNAME}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ case "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
fi
LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
@@ -160,8 +189,16 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
if [ "${LIVE_BINARY_IMAGES}" != "net" ]
then
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
else
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
@@ -201,27 +238,113 @@ LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
# Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
- LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
- LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ VMLINUZ_DI="vmlinuz.di"
+ INITRD_DI="initrddi.gz"
+
+ VMLINUZ_GI="vmlinuz.gi"
+ INITRD_GI="initrdgi.gz"
+ else
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ fi
+ else
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ fi
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+ else
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+ fi
fi
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
# Assembling memtest configuration
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ]
then
- MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ MEMTEST="LABEL memtest\n\tkernel memtest"
+ else
+ MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
+ fi
else
MEMTEST="LABEL memtest\n\tkernel memtest"
fi
+
+ MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi
case "${LIVE_BINARY_IMAGES}" in
@@ -330,11 +453,19 @@ case "${LIVE_BINARY_IMAGES}" in
;;
usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/syslinux"
+ fi
+
# Copying syslinux
- mkdir -p binary
- cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
- cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
- mv binary/isolinux.cfg binary/syslinux.cfg
+ mkdir -p "${DESTDIR}"
+ cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+ cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+ mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
# Copying splash screen
if [ -f config/binary_syslinux/splash.rle ]
@@ -346,37 +477,40 @@ case "${LIVE_BINARY_IMAGES}" in
then
if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
then
- rm -f binary/splash.rle
- sed -e "s/.*splash.*//" binary/syslinux.txt
+ rm -f "${DESTDIR}"/splash.rle
+ sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
else
- cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
+ cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
fi
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
+ sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
# Remove unused files
- rm -f binary/pxelinux.cfg
+ rm -f "${DESTDIR}"/pxelinux.cfg
- # Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- NUMBER=$(($NUMBER + 1))
-
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
- mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
- sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/syslinux.cfg
- done
- else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/syslinux.cfg
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ NUMBER=$(($NUMBER + 1))
+
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+ sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
+ done
+ else
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+ fi
fi
;;
esac
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index b8da499..23187f3 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -126,12 +126,34 @@ fi
if [ -n "${LIVE_USERNAME}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ case "${LH_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_USERNAME}" != "user" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+ fi
+ ;;
+ esac
fi
if [ -n "${LIVE_HOSTNAME}" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ case "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
fi
LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
diff --git a/helpers/make-live b/helpers/make-live
index 08e7cc1..65fd20a 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -31,13 +31,13 @@ done
# Set static variables
PROGRAM="`basename ${0}`"
DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--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]"
+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]"
HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
Local_arguments ()
{
- ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,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: --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-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
@@ -76,8 +76,8 @@ Local_arguments ()
LH_APT_HTTPPROXY="${2}"; shift 2
;;
- --apt-generic)
- LH_APT_GENERIC="${2}"; shift 2
+ --binary-indices)
+ LH_BINARY_INDICES="${2}"; shift 2
;;
--apt-pdiffs)
@@ -175,6 +175,10 @@ Local_arguments ()
LIVE_INTERACTIVE="${2}"; shift 2
;;
+ --initramfs)
+ LH_INITRAMFS="${2}"; shift 2
+ ;;
+
-k|--linux-flavours)
LIVE_LINUX_FLAVOURS="${2}"; shift 2
;;
@@ -353,7 +357,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_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" 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_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_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/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index 5b3e10a..f54caa3 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_BINARY 1 "21.05.2007" "1.0~a11" "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 268209a..49eb816 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_BINARY 1 "2007\-05\-21" "1.0~a11" "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 fcc29a3..fa972da 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_BOOTSTRAP 1 "21.05.2007" "1.0~a11" "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 50db5fb..705e271 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "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 326dfbc..354e0b1 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "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 f810457..a787509 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\-14" "1.0~a10" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "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 cec8083..7e0dc78 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "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 e4aa1a6..655a854 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\-14" "1.0~a10" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "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 703cea4..c4ebe14 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_BUILD 1 "21.05.2007" "1.0~a11" "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 adc25dc..7921b9e 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_BUILD 1 "2007\-05\-21" "1.0~a11" "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 b5310e8..54eb081 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_CHROOT 1 "21.05.2007" "1.0~a11" "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 fb33484..14ce0fd 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_CHROOT 1 "2007\-05\-21" "1.0~a11" "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 02bdce8..2709fe9 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_CLEAN 1 "21.05.2007" "1.0~a11" "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 cc88418..25bfb25 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_CLEAN 1 "2007\-05\-21" "1.0~a11" "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 0176769..34a6c90 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_SOURCE 1 "21.05.2007" "1.0~a11" "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 51ec621..7538d04 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_SOURCE 1 "2007\-05\-21" "1.0~a11" "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 c00aaac..62ad87f 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LH_TESTROOT 1 "21.05.2007" "1.0~a11" "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 a6e80a9..b84ca92 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-05\-21" "1.0~a11" "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 5c22b0f..673d57d 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "14.05.2007" "1.0~a10" "live\-helper"
+.TH LIVE\-HELPER 7 "21.05.2007" "1.0~a11" "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 70979e7..3c31c7b 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-05\-21" "1.0~a11" "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 f380daf..b34f36c 100644
--- a/manpages/make-live.de.1
+++ b/manpages/make-live.de.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "14.05.2007" "1.0~a10" "live\-helper"
+.TH MAKE\-LIVE 1 "21.05.2007" "1.0~a11" "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 fa51dcc..fb72a14 100644
--- a/manpages/make-live.en.1
+++ b/manpages/make-live.en.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "2007\-05\-14" "1.0~a10" "live\-helper"
+.TH MAKE\-LIVE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
.SH NAME
make\-live \- build a Debian Live system
--
cgit v1.0