[Debian-live-changes] r2600 - in releases/live-helper: . 1.0~a20-1/data 1.0~a20-1/debian 1.0~a20-1/docs 1.0~a20-1/functions 1.0~a20-1/helpers 1.0~a20-1/templates 1.0~a20-1/templates/syslinux
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri Jul 27 21:48:33 UTC 2007
Author: daniel
Date: 2007-07-27 21:48:33 +0000 (Fri, 27 Jul 2007)
New Revision: 2600
Added:
releases/live-helper/1.0~a20-1/
releases/live-helper/1.0~a20-1/debian/changelog
releases/live-helper/1.0~a20-1/docs/ChangeLog
releases/live-helper/1.0~a20-1/functions/defaults.sh
releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image
releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a20-1/helpers/lh_chroot
releases/live-helper/1.0~a20-1/helpers/lh_chroot_local-preseed
releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed
releases/live-helper/1.0~a20-1/helpers/lh_config
releases/live-helper/1.0~a20-1/templates/casper/
releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.install
releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.live
releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.install
releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.live
releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install
releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install.g-i
releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.live
releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install
releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install.g-i
releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.live
releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.install
releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.live
releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg
Removed:
releases/live-helper/1.0~a20-1/data/casper/
releases/live-helper/1.0~a20-1/debian/changelog
releases/live-helper/1.0~a20-1/docs/ChangeLog
releases/live-helper/1.0~a20-1/functions/defaults.sh
releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image
releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a20-1/helpers/lh_chroot
releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed
releases/live-helper/1.0~a20-1/helpers/lh_config
releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt
releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt
releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg
Log:
Copied: releases/live-helper/1.0~a20-1 (from rev 2596, dists/trunk/live-helper)
Deleted: releases/live-helper/1.0~a20-1/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/debian/changelog 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,149 +0,0 @@
-live-helper (1.0~a20-1) UNRELEASED; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 23 Jul 2007 00:00:00 +0200
-
-live-helper (1.0~a19-1) unstable; urgency=medium
-
- * New upstream release:
- - Supports using packages from the build host (Closes: #433611).
- - Adds destdir to default entries in grub (Closes: #433612).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 16 Jul 2007 00:00:00 +0200
-
-live-helper (1.0~a18-1) unstable; urgency=medium
-
- * New upstream release:
- - Dropping transitional package, not needed anymore.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 9 Jul 2007 00:00:00 +0200
-
-live-helper (1.0~a17-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 2 Jul 2007 00:00:00 +0200
-
-live-helper (1.0~a16-1) unstable; urgency=medium
-
- * New upstream release:
- - Caches also linux-image packages (Closes: #430511).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 25 Jun 2007 00:00:00 +0200
-
-live-helper (1.0~a15-1) unstable; urgency=medium
-
- * New upstream release:
- - corrected wrong project name in examples/sources/fai (Closes: #428360).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 18 Jun 2007 00:00:00 +0200
-
-live-helper (1.0~a14-1) unstable; urgency=medium
-
- * New upstream release:
- - fixes typo in manpage (Closes: #428192).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 11 Jun 2007 00:00:00 +0200
-
-live-helper (1.0~a13-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 4 Jun 2007 00:00:00 +0200
-
-live-helper (1.0~a12-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 28 May 2007 00:00:00 +0200
-
-live-helper (1.0~a11-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 21 May 2007 00:00:00 +0200
-
-live-helper (1.0~a10-1) unstable; urgency=medium
-
- * New upstream release:
- - really removed forgotten set -x in the cron (Closes: #421105).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 14 May 2007 00:00:00 +0200
-
-live-helper (1.0~a9-1) unstable; urgency=medium
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 7 May 2007 00:00:00 +0200
-
-live-helper (1.0~a8-1) unstable; urgency=medium
-
- * New upstream release:
- - updated syslinux templates (Closes: #399658).
- - removed forgotten set -x in the cron (Closes: #421105).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 30 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a7-1) unstable; urgency=medium
-
- * New upstream release:
- - make-live unmounts proc and sys on exit and failures
- (Closes: #394334, #410147).
- - supporting sudo (Closes: #387069).
-
- -- Daniel Baumann <daniel at debian.org> Mon, 23 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a6-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 16 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a5-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 9 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a4-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 2 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a3-2) unstable; urgency=low
-
- * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 26 Mar 2007 17:00:00 +0200
-
-live-helper (1.0~a3-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 26 Mar 2007 00:00:00 +0100
-
-live-helper (1.0~a2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 19 Mar 2007 00:00:00 +0100
-
-live-helper (1.0~a1-3) unstable; urgency=low
-
- * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org> Wed, 14 Mar 2007 21:00:00 +0100
-
-live-helper (1.0~a1-2) unstable; urgency=low
-
- * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org> Wed, 14 Mar 2007 18:00:00 +0100
-
-live-helper (1.0~a1-1) unstable; urgency=low
-
- * Initial release, replacing live-package.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 12 Mar 2007 00:00:00 +0100
Copied: releases/live-helper/1.0~a20-1/debian/changelog (from rev 2599, dists/trunk/live-helper/debian/changelog)
===================================================================
--- releases/live-helper/1.0~a20-1/debian/changelog (rev 0)
+++ releases/live-helper/1.0~a20-1/debian/changelog 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,149 @@
+live-helper (1.0~a20-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 23 Jul 2007 00:00:00 +0200
+
+live-helper (1.0~a19-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Supports using packages from the build host (Closes: #433611).
+ - Adds destdir to default entries in grub (Closes: #433612).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 16 Jul 2007 00:00:00 +0200
+
+live-helper (1.0~a18-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Dropping transitional package, not needed anymore.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 9 Jul 2007 00:00:00 +0200
+
+live-helper (1.0~a17-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 2 Jul 2007 00:00:00 +0200
+
+live-helper (1.0~a16-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Caches also linux-image packages (Closes: #430511).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 25 Jun 2007 00:00:00 +0200
+
+live-helper (1.0~a15-1) unstable; urgency=medium
+
+ * New upstream release:
+ - corrected wrong project name in examples/sources/fai (Closes: #428360).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 18 Jun 2007 00:00:00 +0200
+
+live-helper (1.0~a14-1) unstable; urgency=medium
+
+ * New upstream release:
+ - fixes typo in manpage (Closes: #428192).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 11 Jun 2007 00:00:00 +0200
+
+live-helper (1.0~a13-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 4 Jun 2007 00:00:00 +0200
+
+live-helper (1.0~a12-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 28 May 2007 00:00:00 +0200
+
+live-helper (1.0~a11-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 21 May 2007 00:00:00 +0200
+
+live-helper (1.0~a10-1) unstable; urgency=medium
+
+ * New upstream release:
+ - really removed forgotten set -x in the cron (Closes: #421105).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 14 May 2007 00:00:00 +0200
+
+live-helper (1.0~a9-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 7 May 2007 00:00:00 +0200
+
+live-helper (1.0~a8-1) unstable; urgency=medium
+
+ * New upstream release:
+ - updated syslinux templates (Closes: #399658).
+ - removed forgotten set -x in the cron (Closes: #421105).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 30 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a7-1) unstable; urgency=medium
+
+ * New upstream release:
+ - make-live unmounts proc and sys on exit and failures
+ (Closes: #394334, #410147).
+ - supporting sudo (Closes: #387069).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 23 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 16 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 9 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 2 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a3-2) unstable; urgency=low
+
+ * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 26 Mar 2007 17:00:00 +0200
+
+live-helper (1.0~a3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 26 Mar 2007 00:00:00 +0100
+
+live-helper (1.0~a2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 19 Mar 2007 00:00:00 +0100
+
+live-helper (1.0~a1-3) unstable; urgency=low
+
+ * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 14 Mar 2007 21:00:00 +0100
+
+live-helper (1.0~a1-2) unstable; urgency=low
+
+ * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 14 Mar 2007 18:00:00 +0100
+
+live-helper (1.0~a1-1) unstable; urgency=low
+
+ * Initial release, replacing live-package.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 12 Mar 2007 00:00:00 +0100
Deleted: releases/live-helper/1.0~a20-1/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/docs/ChangeLog 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,881 +0,0 @@
-2007-07-27 Daniel Baumann <daniel at debian.org>
-
- * Makefile, debian/postinst, prerm:
- - Added alternatives handling for includes and templates.
- * examples/hooks/*:
- - Cleaned up.
-
-2007-07-19 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*:
- - Added support for non-chrooted build.
- - Added caching of deb packages on this stage too.
- * helpers/lh_binary_grub:
- - Added forgotten destdir for default entries.
- * helpers/lh_binary_memtest:
- - Added workaround for grub inside chroot when installing memtest as
- suggested by Vladimir Stavrinov <vs at inist.ru>.
- * helpers/lh_binary_rootfs:
- - Updated squashfs-tools package check.
- * helpers/lh_binary_syslinux:
- - Using etch workaround for long filenames in syslinux on all
- distributions.
- * Uploaded 1.0~a19-1.
-
-2007-07-15 Daniel Baumann <daniel at debian.org>
-
- * examples/cron/manpages.sh, examples/hooks/win32-loader.sh:
- - Added.
-
-2007-07-15 Otavio Salvador <otavio at debian.org>
-
- * functions/templates.sh:
- - Changed whole code to export TEMPLATES for the item beeing
- checked.
- * helpers/lh_binary_grub, helpers/lh_binary_syslinux,
- helpers/lh_binary_yaboot:
- - Changed code to use the new TEMPLATES variable and avoid
- hardcoding the path.
-
-2007-07-14 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_debian-installer:
- - Addded 'live' mode.
- - Fixed a minor typo.
- * helpers/lh_binary_includes:
- - Moved copying of parameters.txt to lh_binary_linux-image.
- - Moved parameters.txt.* to live-initramfs and data/casper.
-
-2007-07-12 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_grub, lh_binary_syslinux:
- - Also respect local menu.lst and syslinux.cfg.
- * helpers/lh_binary_syslinux:
- - Cleaned up netboot specific parts as suggested by
- Vladimir Stavrinov <vs at inist.ru>.
- * helpers/lh_binary_linux-image:
- - Skip vmlinuz/initrd symlinks.
- * helpers/lh_chroot_hacks:
- - Setting correct permissions user home directory in case of includes.
- * helpers/make-live:
- - Fixed typo in variable name.
- * lists/rescue:
- - Added aide and tripwire.
- * Uploaded 1.0~a18-1.
-
-2007-07-09 Chris Lamb <chris at chris-lamb.co.uk>
-
- * functions/chroot.sh, functions/defaults.sh:
- - Altered LH_DEBCONF_NOWARNINGS so that it accepts "enabled/disabled"
- as well as "yes/no" for consistency.
-
-2007-07-09 Daniel Baumann <daniel at debian.org>
-
- * functions/architecture.sh, helpers/lh_binary_debian-installer,
- lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
- lh_binary_syslinux, lh_binary_yaboot:
- - Simplified multi-arch checks/overrides.
- * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
- - Added priority=critical for auto/autogui boot labels.
-
-2007-07-07 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_chroot:
- - Going back to full copy instead of hardlinks.
- * helpers/lh_binary_debian-installer:
- - Added architectures for daily images.
- * helpers/lh_binary_grub:
- - Refactored.
- * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
- - Added 'quiet' for everything newer than etch.
- * helpers/lh_binary_hacks:
- - Merged into lh_binary_includes.
- * helpers/lh_chroot_hacks:
- - Added removal of some build-system influenced files.
- - Cleaned up a bit.
- * helpers/lh_chroot_localization:
- - Fixed typo.
- - Added k3b and gwenview.
- * helpers/lh_chroot_sysvrc:
- - Renamed to lh_chroot_sysv-rc.
- * hooks/mini, minimal:
- - Using apt-get autoremove.
- * lists/devel-live:
- - Added.
-
-2007-07-06 Otavio Salvador <otavio at debian.org>
-
- * helpers/lh_binary_rootfs:
- - Fix parameters to allow the removal of kernels inside of
- squashfs.
-
-2007-07-05 Otavio Salvador <otavio at debian.org>
-
- * helpers/lh_binary_rootfs:
- - Fix inverted logic error to detect when exclude the kernel
- from the squashfs image.
-
-2007-07-04 Otavio Salvador <otavio at debian.org>
-
- * helpers/lh_binary_hacks:
- - Do not fail if binary/parameters.txt.${LH_INITRAMFS} doesn't
- exists.
- * hooks/mini, hooks/minimal:
- - Do not fail if the package isn't installed.
-
-2007-07-04 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Added architecture handling to mirror defaults.
- * helpers/lh_binary_hacks,
- includes/includes/sid/live/parameters.txt.casper,
- parameters.txt.live-initramfs:
- - Added.
-
-2007-07-02 Otavio Salvador <otavio at debian.org>
-
- * helpers/lh_binary_syslinux:
- - Fix paths for kernel and initrd image loading.
-
-2007-07-02 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_grub:
- - Also respect splash.xpm and not just splash.xpm.gz as local grub
- splash images.
-
-2007-07-01 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_debian-installer:
- - Added caching of udebs.
- * functions/defaults.sh, helpers/lh_binary_grub, lh_binary_syslinux,
- lh_binary_grub, lh_config:
- - Added support for aufs.
- * Uploaded 1.0~a17-1.
-
-2007-06-30 Daniel Baumann <daniel at debian.org>
-
- * functions/releases.sh, helpers/lh_binary_disk, lh_source_disk,
- lh_chroot_hostname:
- - Added.
-
-2007-06-29 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_syslinux:
- - Fixed damaged memtest entry.
- - Corrected code style.
- - Added NUMBER initaliazation to fixed wrong numbering when in compat
- mode.
- - Fixed bug with isolinux.cfg fuckup if flavours are in this order:
- 686 686-bigmem.
- * helpers/lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
- lh_binary_syslinux:
- - Added compat mode for casper/live directories.
- * helpers/lh_binary_manifest, lh_binary_md5sum, lh_source_mdsum:
- - Added introductional text to the generated file.
- * helpers/lh_binary_manifest:
- - Only create the correct manifest file for the respective initramfs.
- * helpers/lh_binary_disk, lh_source_disk:
- - Added.
-
-2007-06-27 Otavio Salvador <otavio at debian.org>
-
- * helpers/lh_binary_syslinux:
- - Added new methods (syslinux_live_entry and syslinux_di_entry) and
- change whole code to use them making it much easier to read and
- modify.
- * functions/arch.sh:
- - Added.
- * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
- - Use the new Check_architecture method to avoid duplicated code.
- * functions/templates.sh:
- - Added.
- * helpers/lh_binary_grub, helpers/lh_binary_syslinux,
- helpers/lh_binary_yaboot:
- - Use the new Check_templates method to avoid duplicated code.
-
-2007-06-25 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_local-hooks:
- - Added.
- * helpers/lh_chroot_linux-image:
- - Caching downloaded packages.
- * examples/hooks/qemu-launcher.sh:
- - Added.
- * Uploaded 1.0~a16-1.
-
-2007-06-18 Chris Lamb <chris at chris-lamb.co.uk>
-
- * helpers/lh_chroot_packageslists, lh_chroot_local-packageslists:
- - Added support for '#<include>' pragma to include other list files.
- * functions/packagelists.sh:
- - Added.
- * lists/*:
- - Translated existing lists to be include-based, added a few missing
- lists.
-
-2007-06-18 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - All cache operations use hardlinks now.
-
-2007-06-16 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_bootstrap_clone, lh_bootstrap_copy:
- - Added.
- * helpers/lh_binary_live-installer:
- - Added.
- * Uploaded 1.0~a15-1.
-
-2007-06-10 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Excluding lenny from the syslinux workarounds as syslinux 3.36 did
- migrate into testing.
- * helpers/lh_bootstrap_cache, lh_chroot_cache:
- - Fixed typos which made caching fail on rebuilds.
- * helpers/lh_clean:
- - Added unmount of binfmt on clean.
- * helpers/lh_binary_usb-hdd:
- - Including script to write grub to the loop device from Thomas Lange
- <lange at informatik.uni-koeln.de>.
-
-2007-06-10 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_grub, lh_binary_rootfs, lh_binary_yaboot,
- lh_binary_syslinux:
- - Fixed some typos as found by Peter Holik <holik at it-technology.at>.
- * manpages/live-helper.en.7:
- - Fixed typo.
- * helpers/lh_bootstrap_cache, lh_chroot_cache:
- - Added.
- * Uploaded 1.0~a14-1.
-
-2007-06-08 Daniel Baumann <daniel at debian.org>
-
- * helpers/make-live:
- - Adjusted reading of configuration to match the previously renamed
- files.
-
-2007-06-04 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_hdd, lh_source_hdd:
- - Renamed to lh_binary_tar and lh_source_tar.
- * helpers/lh_source_generic:
- - Removed.
-
-2007-06-03 Daniel Baumann <daniel at debian.org>
-
- * Uploaded 1.0~a13-1.
-
-2007-06-02 Otavio Salvador <otavio at debian.org>
-
- * helpers/lh_chroot_preseed:
- - Use {Check,Install,Remove}_package to handle debconf dependency.
- * Add support to specify the apt/aptitude pipeline depth.
-
-2007-06-02 Daniel Baumann <daniel at debian.org>
-
- * Applied patches from Otavio Salvador <otavio at debian.org>:
- - Add support to override helpers base directory
- - Use LIVE_BOOTSTRAP_CONFIG instead of LIVE_DISTRIBUTION_CONFIG.
- - Add support to specify the keyring to be used while bootstraping.
- - Add lh_chroot_preseed helper.
-
-2007-05-28 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Added initial P: messages.
- - Removed some bashisms.
- - Added some of the proposed cleanups from Trent Buck
- <trentbuck at gmail.com>.
- * lists/mini, minimal:
- - Removed, already pulled in with live-initramfs depends.
-
-2007-05-27 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_rootfs:
- - Added check for config/binary_rootfs/squashfs.sort for passing a
- sorting list to mksquashfs.
-
-2007-05-26 Daniel Baumann <daniel at debian.org>
-
- * lists/rescue:
- - Updated with suggestions from Inigo Tejedor Arrondo
- <inigo at navarrux.org>
- * Uploaded 1.0~a12-1.
-
-2007-05-25 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Updated check for LH_BOOTSTRAP on ubuntu.
- * helpers/lh_binary_iso, lh_source_iso:
- - Added configuration support for ISO application, preparer and
- publisher field.
-
-2007-05-24 Daniel Baumann <daniel at 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 at debian.org>
-
- * helpers/*:
- - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
- - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES.
- - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
- - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
- - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
- - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
- - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
- * Uploaded 1.0~a10-1.
-
-2007-05-18 Mathieu Geli <mathieu.geli at gmail.com>
-
- * examples/hooks/*
- - Added new hooks for non-free/contrib drivers
- Intel : ipw3945, ipw2100, ipw2200
- Nvidia : nvidia-legacy
- Ralink : rt2x00, rt2570
- - Changed behavior of beryl hook: autostart beryl
- if video driver allows it (minimal detection based on glxinfo)
-
-2007-05-17 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_md5sum, lh_source,md5sum:
- - Fixed accidentally inclusion of md5sum.txt itself into
- binary/md5sum.txt.
-
-2007-05-16 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Added check for local includes and templates.
- - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
- - Renamed lh_binary_localincludes to lh_binary_local-includes.
- - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
- - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
- - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
- - Renamed lh_chroot_localpackageslists to
- lh_chroot_local-packageslists.
- - Renamed lh_source_download to lh_source_debian.
- - Renamed lh_source_config to lh_source_debian-live.
-
-2007-05-09 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
- - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
- * helpers/lh_chroot_sources:
- - Added aptitude overwrite for untrusted sources.
- - Changed checks for *.build/*.image to *.bootstrap/*.binary.
-
-2007-05-08 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Renamed lh_binary_linuximage to lh_binary_linux-image.
- - Renamed lh_chroot_linuximage to lh_chroot_linux-image.
- * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
- - Added missing cache directory when only caching stages.
- * helpers/lh_binary_debian-installer, lh_binary_linux-image,
- lh_binary_memtest:
- - Changed kernel installation directories.
-
-2007-05-07 Daniel Baumann <daniel at debian.org>
-
- * examples/snapshot-build.sh, live-snapshot.sources.list:
- - Added.
- * helpers/lh_binary_rootfs:
- - Fixed wrong order of squashfs options.
-
-2007-05-06 Daniel Baumann <daniel at debian.org>
-
- * templates/syslinux:
- - Updated again.
- * helpers/lh_config:
- - Fixed overwriting of LH_* options.
- * helpers/lh_binary_includes:
- - Fixed a quoting typo.
- - Working arround symlinks on usb-hdd binary images.
- * Uploaded 1.0~a9-1.
-
-2007-04-31 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Added LH_INITRAMFS.
- - Splitted config/image into config/binary and config/source.
- * Uploaded 1.0~a8-1.
-
-2007-04-26 Daniel Baumann <daniel at debian.org>
-
- * helpers/*:
- - Implemented paranoid caching with LIVE_CACHE_INDICES,
- LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
- images offline from the cache.
-
-2007-04-25 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_usb, lh_source_usb:
- - In preparation of adding support for usb-zip images, the usb binary
- type is renamed to usb-hdd.
-
-2007-04-24 Daniel Baumann <daniel at debian.org>
-
- * functions/stagefile.sh:
- - Requite_stagefile can require more than one stage.
- * helpers/lh_binary_debian-installer:
- - Added.
-
-2007-04-23 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
- - Added workaround for vfat limitations.
-
-2007-04-23 Daniel Baumann <daniel at debian.org>
-
- * Makefile:
- - Added simple test rule.
- * functions/*, helpers/*:
- - Added LH_ROOT_COMMAND to support sudo.
- * functions/package.sh:
- - Added. Helper dependencies in-chroot can now be handled by
- functions.
- * helpers/make-live:
- - Added trap to unmount proc and sys on exit and failure.
- * Uploaded 1.0~a7-1.
-
-2007-04-22 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - In ubuntu mode, setting default sections to main restricted.
- * helpers/lh_binary_grub:
- - Making copy call of grub arch independent.
- * helpers/lh_chroot_sources:
- - In debian mode, checking for non-sid rather than if-etch.
- - Fixed wrong Ubuntu security URL.
-
-2007-04-20 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_rootfs, lh_binary_iso:
- - Added mksquashfs/genisoimage quiet/verbose options.
-
-2007-04-19 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_grub, lh_binary_syslinux:
- - Added check for splash in config directory.
-
-2007-04-18 Daniel Baumann <daniel at debian.org>
-
- * debian/cron.daily, default:
- - Added.
- * doc/BUGS, DOWNLOAD:
- - Added.
- * examples/edu.sources.list, fai.sources.list:
- - Added.
- * manpages/*:
- - Added language suffix.
- - Added German translations.
-
-2007-04-17 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_chroot_hooks:
- - Also check for tasks specific hooks, not just for package lists.
- * helpers/lh_chroot_tasks:
- - Allowing to use either aptitude or tasksel.
- * hooks/kde-desktop:
- - Added.
- * manpages/lh_build.1, lh_source.1:
- - Added.
-
-2007-04-16 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Using lsb_release, if existing, to set default mode to ubuntu on
- ubuntu systems.
- - Moved desktop task to the end, so that gdm doesn't take
- gnome-session as default.
- * helpers/lh_chroot_hooks:
- - Added simple --hooks for easy testing.
- * Uploaded 1.0~a6-1.
-
-2007-04-15 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Set LH_APT to apt-get when using mini or minimal.
- * helpers/lh_chroot_sources:
- - Excluding comments from local sources lists.
- * helpers/lh_bootstrap_cdebootstrap:
- - Removing imported configuration files by cdebootstrap.
-
-2007-04-13 Daniel Baumann <daniel at debian.org>
-
- * Moved examples from /usr/share/doc to /usr/share/live-helper.
- * examples/bpo.sources.list:
- - Added.
- * functions/defaults.sh:
- - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
- * helpers/lh_clean:
- - Added missing removal of generic source.
-
-2007-04-12 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_config, make-live:
- - Adding --config.
- * helpers/lh_binary_memtester86:
- - Renamed to lh_binary_memtest, made more generic.
- * functions/defaults.sh:
- - Setting default distribution to etch until 2.6.20 has setteled in
- unstable.
-
-2007-04-11 Daniel Baumann <daniel at debian.org>
-
- * Merging from sidux fllbuilder 1.0.4:
- - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
- - helpers/lh_chroot_linuximage: Added additional options to
- kernel-img.conf.
- - helpers/lh_chroot_proc: Made binfmt umount conditional.
- * contrib/grub-splash/*, templates/grub/splash.xpm.gz:
- - Added.
- * helpers/lh_binary_grub, lh_binary_syslinux:
- - Added failsafe kernel entries.
- * helpers/lh_chroot_apt:
- - Using apt.conf.d also for apt, not just for aptitude.
- - Minor code cleanup.
- * helpers/lh_source_*:
- - Minor code cleanup.
- * helpers/lh_source_download:
- - Added LIVE_BOOTLOADER to the list of source packages.
- * contrib/grub-splash/*, templates/grub/splash.xpm.gz:
- - Added.
-
-2007-04-10 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_includes, includes/*:
- - Redone.
-
-2007-04-09 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_yaboot, templates/yaboot:
- - Added.
-
-2007-04-09 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_config, make-live, functions/defaults.sh:
- - Added mode to distinguish between Debian and Ubuntu.
- * helpers/lh_chroot_sources:
- - Added check for LIVE_MIRROR_BUILD* to be equal to
- LIVE_MIRROR_IMAGE*.
- * Uploaded 1.0~a5-1.
-
-2007-04-08 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_net:
- - Added check for namespace collision with LIVE_SERVER_PATH.
- * helpers/lh_binary_grub:
- - Added functionality for usb|hdd images.
-
-2007-04-07 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_chroot_sources:
- - Moved check for local source lists from
- config/sources.lists.{build,image} to
- config/chroot_sources/*.{build,image}.
- - Added check for local gpg keys in
- config/chroot_sources/*.{build,image}.gpg.
- - Added check for local keyring packages in
- config/chroot_sources/*.deb.
- - Added LIVE_KEYRING_PACKAGES.
-
-2007-04-06 Daniel Baumann <daniel at debian.org>
-
- * functions/breakpoints.sh, helpers/*:
- - Added initial breakpoints.
- * functions/chroot.sh:
- - Adding /usr/local to path.
- * functions/lockfile.sh:
- - Added additional signals to the trap.
- * helpers/lh_binary_includes:
- - Respect LIVE_INCLUDES=none.
- * manpages/*:
- - Updated.
-
-2007-04-05 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_grub, templates/grub/menu.lst:
- - Added splash functionality.
- * Uploaded 1.0~a4-1.
-
-2007-04-03 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_grub, lh_binary_grub:
- - Added check for LIVE_TEMPLATES to be existing.
- * helpers/lh_binary_includes:
- - Added check for LIVE_INCLUDES to be existing.
-
-2007-04-02 Daniel Baumann <daniel at debian.org>
-
- * functions/*, helpers/*:
- - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
- * helpers/lh_binary_iso:
- - Added exclude for the bootloader from the iso image content.
-
-2007-04-01 Daniel Baumann <daniel at debian.org>
-
- * helper/lh_binary_grub:
- - Added.
-
-2007-03-30 Daniel Baumann <daniel at debian.org>
-
- * helper/lh_chroot_localincludes:
- - Fixed wrong path for hook removal.
-
-2007-03-29 Daniel Baumann <daniel at debian.org>
-
- * functions/common.sh, echo.sh:
- - Added.
- * doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
- - Added forgotten helpers.
- * doc/FAQ:
- - Added.
- * lists/mini, minimal:
- - Added --yes to apt call to make them non-interactive.
- * manpages/lh_chroot.1:
- - Added.
-
-2007-03-28 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
- - Added --debug, --quiet, and --verbose.
-
-2007-03-27 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_linuximage, lh_binary_memtest86:
- - Added missing Read_conffiles to fix foreign architecture builds.
-
-2007-03-26 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
- lh_clean:
- - Added routine to cache bootstrapped chroot as suggested by Kai
- Hendry <hendry at iki.fi>.
- * helpers/lh_chroot_rootfs:
- - Fixed typo in net type.
- * lists/gnome*, kde*, standard-x11, xfce*:
- - Added menu.
-
-2007-03-26 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Fixed handling of desktop list variable loop.
- * Uploaded 1.0~a3-1.
-
-2007-03-25 Daniel Baumann <daniel at debian.org>
-
- * functions/*, helpers/*:
- - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
- - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
- * functions/cache.sh:
- - Added.
- * helpers/lh_bootstrap_cdebootstrap:
- - Added removal of cdebootstrap-helper-diverts.
- * helpers/lh_binary_chroot:
- - Added.
- * helpers/lh_binary_rootfs:
- - Moved filesystem routines into chroot.
- * helpers/lh_chroot_localization, lh_chroot_localpackages,
- lh_chroot_localpackageslists, lh_chroot_packages,
- lh_chroot_packageslists, lh_chroot_tasks:
- - Added check for LH_CACHE.
- * helpers/lh_chroot_apt:
- - Removing old apt.conf if existing as suggested by Ben Armstrong
- <synrg at debian.org>.
- * helpers/lh_chroot_hacks:
- - Added check for already installed smbfs.
- - Added check for already configured initramfs.conf as suggested by
- Ben Armstrong <synrg at debian.org>.
- * helpers/lh_chroot_interactive:
- - Added.
- * helpers/lh_chroot_tasks:
- - Added routine for LH_APT=apt.
- * lists/minimal-net:
- - Minimized.
-
-2007-03-24 Daniel Baumann <daniel at debian.org>
-
- * functions/*, helpers/*, hooks/*:
- - Added GPL blurb.
- * functions/arguments.sh, helpers/*:
- - Added common arguments.
- * functions/arguments.sh, stagefile.sh, helpers/*,
- manpages/live-helper.7:
- - Added --force option.
- * functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
- make-live:
- - Added LIVE_USERNAME and LIVE_HOSTNAME.
- * helpers/lh_binary_linuximage, lh_binary_memtest86,
- lh_binary_syslinux:
- - Moved kernel directory to live.
- * helpers/lh_clean:
- - Added purge.
-
-2007-03-23 Daniel Baumann <daniel at debian.org>
-
- * helpers/make-live:
- - Calling Arguments twice to catch case with non-default root.
-
-2007-03-22 Daniel Baumann <daniel at debian.org>
-
- * functions/default.sh, helpers/*:
- - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
- lh_chroot_localpackageslist to lh_chroot_localpackageslists
- * helpers/lh_binary_includes:
- - Using LIVE_INCLUDES now.
- * helpers/lh_chroot_apt:
- - Added LH_APT_SECURE.
- * helpers/lh_chroot_linuximage:
- - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
- local packages.
-
-2007-03-21 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
- - Checking earlier if there is something todo.
- * helpers/lh_binary_linuximage, lh_binary_syslinux,
- lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
- - Extended to support multiple kernels at once.
- * helpers/lh_binary_includes, lh_binary_localincludes,
- lh_chroot_localincludes:
- - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
- * helpers/lh_source_md5sum:
- - Added.
- * helpers/make-live:
- - Added short options in ARGUMENTS.
- * functions/defaults.sh, helpers/*:
- - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
- - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
- LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
-
-2007-03-20 Daniel Baumann <daniel at debian.org>
-
- * helpers/make-live:
- - Fixed typo in ARGUMENTS.
-
-2007-03-19 Daniel Baumann <daniel at debian.org>
-
- * lists/gnome*, kde*, standard-x11, xfce*:
- - Added alsa-base, alsa-oss, alsa-utils, and discover.
-
-2007-03-19 Daniel Baumann <daniel at debian.org>
-
- * Uploaded 1.0~a2-1.
-
-2007-03-18 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Quoted date call in LIVE_ISO_VOLUME.
- * manpages/lh_clean.1:
- - Added.
-
-2007-03-17 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh, helpers/*:
- - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
- to LIVE_MIRROR_LOCAL_SECURITY.
- * doc/examples/beryl-hook.sh:
- - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
- * helpers/lh_config, make-live:
- - Added check for newconfig to prevent overwriting of non-specified
- options to default values.
- * helpers/lh_chroot_localhooks:
- - Added basename where needed.
- * helpers/lh_chroot_sources:
- - Added check for local sources.list in config for custom
- repositories.
- - Replaced security check for etch with check for not-unstable.
- * manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
- lh_bootstrap_debootstrap.1, lh_testroot.1:
- - Added.
- * templates/syslinux/pxlinux.cfg:
- - Fixed path.
-
-2007-03-16 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_binary_usb: Corrected stagefile creation.
-
-2007-03-15 Daniel Baumann <daniel at debian.org>
-
- * Makefile:
- - Replaced helper uninstall routine with a less intrusive one.
- * doc/NEWS:
- - Updated.
- * functions/conffile.sh:
- - Beautified.
- * functions/defaults.sh:
- - Added LH_LOSETUP.
- * functions/lockfile.sh:
- - Beautified.
- * helpers/*:
- - Allowing apt-get, not just apt in LH_APT.
- * helpers/lh_config:
- - Added check for existing configuration.
- * helpers/lh_binary_md5sum:
- - Removed legacy code.
- * helpers/lh_binary_manifest:
- - Added creation of packages.txt.
- * helpers/lh_binary_usb, lh_source_usb:
- - Replaced loop device node workaround with a better one.
- * helpers/lh_chroot_hooks, lh_chroot_localhooks:
- - Fixed executable check.
- * helpers/lh_source_config:
- - Added.
- * helpers/lh_source_download:
- - Separeted debian sources and debian-live configuration into
- different directories.
- - Added live-helper to the sources.
- * helpers/lh_source_generic, lh_source_iso, lh_source_usb,
- lh_source_net:
- - Removed annyoing warning when sources are disabled.
- * helpers/lh_source_net:
- - Beautified.
- * helpers/make-live:
- - Fixed typo in ARGUMENTS.
- - Moved help, usage, version into functions.
- - Removed build pre-option.
- * manpages/live-helper.7:
- - Added.
- * templates/syslinux/f10.txt:
- - Added note about Debian Live project.
-
-2007-03-14 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh, helpers/*:
- - Converted LIVE_ROOT to directory, not full path.
- * functions/*, helpers/*:
- - Replaced LIVE_CHROOT with directory name.
- * functions/conffile.sh:
- - Added warning if CONFFILE is not readable.
- * helpers/lh_chroot_localization:
- - Completed check for koffice.
- * helpers/lh_source_download:
- - Fixed typo in old source removal.
-
-2007-03-14 Daniel Baumann <daniel at debian.org>
-
- * helpers/lh_chroot_hacks:
- - Added removal of udev persistent-net rule.
- * Uploaded 1.0~a1-3.
-
-2007-03-14 Daniel Baumann <daniel at debian.org>
-
- * functions/defaults.sh:
- - Fixed setting of LIVE_SYSVINIT.
- * helpers/lh_chroot_sysvinit:
- - Changed check for LIVE_SYSVINIT from disabled to enabled.
- * Uploaded 1.0~a1-2.
-
-2007-03-12 Daniel Baumann <daniel at debian.org>
-
- * Rewritten live-package.
- * Uploaded 1.0~a1-1.
Copied: releases/live-helper/1.0~a20-1/docs/ChangeLog (from rev 2598, dists/trunk/live-helper/docs/ChangeLog)
===================================================================
--- releases/live-helper/1.0~a20-1/docs/ChangeLog (rev 0)
+++ releases/live-helper/1.0~a20-1/docs/ChangeLog 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,889 @@
+2007-07-27 Daniel Baumann <daniel at debian.org>
+
+ * Makefile, debian/postinst, prerm:
+ - Added alternatives handling for includes and templates.
+ * examples/hooks/*:
+ - Cleaned up.
+ * helpers/lh_chroot_preseed:
+ - Process flavour specific preseeds, if available, dropping
+ LIVE_PRESEED.
+ * helpers/lh_chroot_local-preseed:
+ - Added.
+ * templates/syslinux:
+ - Added installer specific templates.
+ - Renamebled additional boot targets (localboot).
+
+2007-07-19 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*:
+ - Added support for non-chrooted build.
+ - Added caching of deb packages on this stage too.
+ * helpers/lh_binary_grub:
+ - Added forgotten destdir for default entries.
+ * helpers/lh_binary_memtest:
+ - Added workaround for grub inside chroot when installing memtest as
+ suggested by Vladimir Stavrinov <vs at inist.ru>.
+ * helpers/lh_binary_rootfs:
+ - Updated squashfs-tools package check.
+ * helpers/lh_binary_syslinux:
+ - Using etch workaround for long filenames in syslinux on all
+ distributions.
+ * Uploaded 1.0~a19-1.
+
+2007-07-15 Daniel Baumann <daniel at debian.org>
+
+ * examples/cron/manpages.sh, examples/hooks/win32-loader.sh:
+ - Added.
+
+2007-07-15 Otavio Salvador <otavio at debian.org>
+
+ * functions/templates.sh:
+ - Changed whole code to export TEMPLATES for the item beeing
+ checked.
+ * helpers/lh_binary_grub, helpers/lh_binary_syslinux,
+ helpers/lh_binary_yaboot:
+ - Changed code to use the new TEMPLATES variable and avoid
+ hardcoding the path.
+
+2007-07-14 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_debian-installer:
+ - Addded 'live' mode.
+ - Fixed a minor typo.
+ * helpers/lh_binary_includes:
+ - Moved copying of parameters.txt to lh_binary_linux-image.
+ - Moved parameters.txt.* to live-initramfs and data/casper.
+
+2007-07-12 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_grub, lh_binary_syslinux:
+ - Also respect local menu.lst and syslinux.cfg.
+ * helpers/lh_binary_syslinux:
+ - Cleaned up netboot specific parts as suggested by
+ Vladimir Stavrinov <vs at inist.ru>.
+ * helpers/lh_binary_linux-image:
+ - Skip vmlinuz/initrd symlinks.
+ * helpers/lh_chroot_hacks:
+ - Setting correct permissions user home directory in case of includes.
+ * helpers/make-live:
+ - Fixed typo in variable name.
+ * lists/rescue:
+ - Added aide and tripwire.
+ * Uploaded 1.0~a18-1.
+
+2007-07-09 Chris Lamb <chris at chris-lamb.co.uk>
+
+ * functions/chroot.sh, functions/defaults.sh:
+ - Altered LH_DEBCONF_NOWARNINGS so that it accepts "enabled/disabled"
+ as well as "yes/no" for consistency.
+
+2007-07-09 Daniel Baumann <daniel at debian.org>
+
+ * functions/architecture.sh, helpers/lh_binary_debian-installer,
+ lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
+ lh_binary_syslinux, lh_binary_yaboot:
+ - Simplified multi-arch checks/overrides.
+ * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
+ - Added priority=critical for auto/autogui boot labels.
+
+2007-07-07 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_chroot:
+ - Going back to full copy instead of hardlinks.
+ * helpers/lh_binary_debian-installer:
+ - Added architectures for daily images.
+ * helpers/lh_binary_grub:
+ - Refactored.
+ * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
+ - Added 'quiet' for everything newer than etch.
+ * helpers/lh_binary_hacks:
+ - Merged into lh_binary_includes.
+ * helpers/lh_chroot_hacks:
+ - Added removal of some build-system influenced files.
+ - Cleaned up a bit.
+ * helpers/lh_chroot_localization:
+ - Fixed typo.
+ - Added k3b and gwenview.
+ * helpers/lh_chroot_sysvrc:
+ - Renamed to lh_chroot_sysv-rc.
+ * hooks/mini, minimal:
+ - Using apt-get autoremove.
+ * lists/devel-live:
+ - Added.
+
+2007-07-06 Otavio Salvador <otavio at debian.org>
+
+ * helpers/lh_binary_rootfs:
+ - Fix parameters to allow the removal of kernels inside of
+ squashfs.
+
+2007-07-05 Otavio Salvador <otavio at debian.org>
+
+ * helpers/lh_binary_rootfs:
+ - Fix inverted logic error to detect when exclude the kernel
+ from the squashfs image.
+
+2007-07-04 Otavio Salvador <otavio at debian.org>
+
+ * helpers/lh_binary_hacks:
+ - Do not fail if binary/parameters.txt.${LH_INITRAMFS} doesn't
+ exists.
+ * hooks/mini, hooks/minimal:
+ - Do not fail if the package isn't installed.
+
+2007-07-04 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Added architecture handling to mirror defaults.
+ * helpers/lh_binary_hacks,
+ includes/includes/sid/live/parameters.txt.casper,
+ parameters.txt.live-initramfs:
+ - Added.
+
+2007-07-02 Otavio Salvador <otavio at debian.org>
+
+ * helpers/lh_binary_syslinux:
+ - Fix paths for kernel and initrd image loading.
+
+2007-07-02 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_grub:
+ - Also respect splash.xpm and not just splash.xpm.gz as local grub
+ splash images.
+
+2007-07-01 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_debian-installer:
+ - Added caching of udebs.
+ * functions/defaults.sh, helpers/lh_binary_grub, lh_binary_syslinux,
+ lh_binary_grub, lh_config:
+ - Added support for aufs.
+ * Uploaded 1.0~a17-1.
+
+2007-06-30 Daniel Baumann <daniel at debian.org>
+
+ * functions/releases.sh, helpers/lh_binary_disk, lh_source_disk,
+ lh_chroot_hostname:
+ - Added.
+
+2007-06-29 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_syslinux:
+ - Fixed damaged memtest entry.
+ - Corrected code style.
+ - Added NUMBER initaliazation to fixed wrong numbering when in compat
+ mode.
+ - Fixed bug with isolinux.cfg fuckup if flavours are in this order:
+ 686 686-bigmem.
+ * helpers/lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
+ lh_binary_syslinux:
+ - Added compat mode for casper/live directories.
+ * helpers/lh_binary_manifest, lh_binary_md5sum, lh_source_mdsum:
+ - Added introductional text to the generated file.
+ * helpers/lh_binary_manifest:
+ - Only create the correct manifest file for the respective initramfs.
+ * helpers/lh_binary_disk, lh_source_disk:
+ - Added.
+
+2007-06-27 Otavio Salvador <otavio at debian.org>
+
+ * helpers/lh_binary_syslinux:
+ - Added new methods (syslinux_live_entry and syslinux_di_entry) and
+ change whole code to use them making it much easier to read and
+ modify.
+ * functions/arch.sh:
+ - Added.
+ * helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
+ - Use the new Check_architecture method to avoid duplicated code.
+ * functions/templates.sh:
+ - Added.
+ * helpers/lh_binary_grub, helpers/lh_binary_syslinux,
+ helpers/lh_binary_yaboot:
+ - Use the new Check_templates method to avoid duplicated code.
+
+2007-06-25 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_local-hooks:
+ - Added.
+ * helpers/lh_chroot_linux-image:
+ - Caching downloaded packages.
+ * examples/hooks/qemu-launcher.sh:
+ - Added.
+ * Uploaded 1.0~a16-1.
+
+2007-06-18 Chris Lamb <chris at chris-lamb.co.uk>
+
+ * helpers/lh_chroot_packageslists, lh_chroot_local-packageslists:
+ - Added support for '#<include>' pragma to include other list files.
+ * functions/packagelists.sh:
+ - Added.
+ * lists/*:
+ - Translated existing lists to be include-based, added a few missing
+ lists.
+
+2007-06-18 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - All cache operations use hardlinks now.
+
+2007-06-16 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_bootstrap_clone, lh_bootstrap_copy:
+ - Added.
+ * helpers/lh_binary_live-installer:
+ - Added.
+ * Uploaded 1.0~a15-1.
+
+2007-06-10 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Excluding lenny from the syslinux workarounds as syslinux 3.36 did
+ migrate into testing.
+ * helpers/lh_bootstrap_cache, lh_chroot_cache:
+ - Fixed typos which made caching fail on rebuilds.
+ * helpers/lh_clean:
+ - Added unmount of binfmt on clean.
+ * helpers/lh_binary_usb-hdd:
+ - Including script to write grub to the loop device from Thomas Lange
+ <lange at informatik.uni-koeln.de>.
+
+2007-06-10 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_grub, lh_binary_rootfs, lh_binary_yaboot,
+ lh_binary_syslinux:
+ - Fixed some typos as found by Peter Holik <holik at it-technology.at>.
+ * manpages/live-helper.en.7:
+ - Fixed typo.
+ * helpers/lh_bootstrap_cache, lh_chroot_cache:
+ - Added.
+ * Uploaded 1.0~a14-1.
+
+2007-06-08 Daniel Baumann <daniel at debian.org>
+
+ * helpers/make-live:
+ - Adjusted reading of configuration to match the previously renamed
+ files.
+
+2007-06-04 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_hdd, lh_source_hdd:
+ - Renamed to lh_binary_tar and lh_source_tar.
+ * helpers/lh_source_generic:
+ - Removed.
+
+2007-06-03 Daniel Baumann <daniel at debian.org>
+
+ * Uploaded 1.0~a13-1.
+
+2007-06-02 Otavio Salvador <otavio at debian.org>
+
+ * helpers/lh_chroot_preseed:
+ - Use {Check,Install,Remove}_package to handle debconf dependency.
+ * Add support to specify the apt/aptitude pipeline depth.
+
+2007-06-02 Daniel Baumann <daniel at debian.org>
+
+ * Applied patches from Otavio Salvador <otavio at debian.org>:
+ - Add support to override helpers base directory
+ - Use LIVE_BOOTSTRAP_CONFIG instead of LIVE_DISTRIBUTION_CONFIG.
+ - Add support to specify the keyring to be used while bootstraping.
+ - Add lh_chroot_preseed helper.
+
+2007-05-28 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Added initial P: messages.
+ - Removed some bashisms.
+ - Added some of the proposed cleanups from Trent Buck
+ <trentbuck at gmail.com>.
+ * lists/mini, minimal:
+ - Removed, already pulled in with live-initramfs depends.
+
+2007-05-27 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_rootfs:
+ - Added check for config/binary_rootfs/squashfs.sort for passing a
+ sorting list to mksquashfs.
+
+2007-05-26 Daniel Baumann <daniel at debian.org>
+
+ * lists/rescue:
+ - Updated with suggestions from Inigo Tejedor Arrondo
+ <inigo at navarrux.org>
+ * Uploaded 1.0~a12-1.
+
+2007-05-25 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Updated check for LH_BOOTSTRAP on ubuntu.
+ * helpers/lh_binary_iso, lh_source_iso:
+ - Added configuration support for ISO application, preparer and
+ publisher field.
+
+2007-05-24 Daniel Baumann <daniel at 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 at debian.org>
+
+ * helpers/*:
+ - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
+ - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES.
+ - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
+ - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
+ - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
+ - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
+ - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
+ * Uploaded 1.0~a10-1.
+
+2007-05-18 Mathieu Geli <mathieu.geli at gmail.com>
+
+ * examples/hooks/*
+ - Added new hooks for non-free/contrib drivers
+ Intel : ipw3945, ipw2100, ipw2200
+ Nvidia : nvidia-legacy
+ Ralink : rt2x00, rt2570
+ - Changed behavior of beryl hook: autostart beryl
+ if video driver allows it (minimal detection based on glxinfo)
+
+2007-05-17 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_md5sum, lh_source,md5sum:
+ - Fixed accidentally inclusion of md5sum.txt itself into
+ binary/md5sum.txt.
+
+2007-05-16 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Added check for local includes and templates.
+ - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
+ - Renamed lh_binary_localincludes to lh_binary_local-includes.
+ - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
+ - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
+ - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
+ - Renamed lh_chroot_localpackageslists to
+ lh_chroot_local-packageslists.
+ - Renamed lh_source_download to lh_source_debian.
+ - Renamed lh_source_config to lh_source_debian-live.
+
+2007-05-09 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
+ - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
+ * helpers/lh_chroot_sources:
+ - Added aptitude overwrite for untrusted sources.
+ - Changed checks for *.build/*.image to *.bootstrap/*.binary.
+
+2007-05-08 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Renamed lh_binary_linuximage to lh_binary_linux-image.
+ - Renamed lh_chroot_linuximage to lh_chroot_linux-image.
+ * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
+ - Added missing cache directory when only caching stages.
+ * helpers/lh_binary_debian-installer, lh_binary_linux-image,
+ lh_binary_memtest:
+ - Changed kernel installation directories.
+
+2007-05-07 Daniel Baumann <daniel at debian.org>
+
+ * examples/snapshot-build.sh, live-snapshot.sources.list:
+ - Added.
+ * helpers/lh_binary_rootfs:
+ - Fixed wrong order of squashfs options.
+
+2007-05-06 Daniel Baumann <daniel at debian.org>
+
+ * templates/syslinux:
+ - Updated again.
+ * helpers/lh_config:
+ - Fixed overwriting of LH_* options.
+ * helpers/lh_binary_includes:
+ - Fixed a quoting typo.
+ - Working arround symlinks on usb-hdd binary images.
+ * Uploaded 1.0~a9-1.
+
+2007-04-31 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Added LH_INITRAMFS.
+ - Splitted config/image into config/binary and config/source.
+ * Uploaded 1.0~a8-1.
+
+2007-04-26 Daniel Baumann <daniel at debian.org>
+
+ * helpers/*:
+ - Implemented paranoid caching with LIVE_CACHE_INDICES,
+ LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
+ images offline from the cache.
+
+2007-04-25 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_usb, lh_source_usb:
+ - In preparation of adding support for usb-zip images, the usb binary
+ type is renamed to usb-hdd.
+
+2007-04-24 Daniel Baumann <daniel at debian.org>
+
+ * functions/stagefile.sh:
+ - Requite_stagefile can require more than one stage.
+ * helpers/lh_binary_debian-installer:
+ - Added.
+
+2007-04-23 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
+ - Added workaround for vfat limitations.
+
+2007-04-23 Daniel Baumann <daniel at debian.org>
+
+ * Makefile:
+ - Added simple test rule.
+ * functions/*, helpers/*:
+ - Added LH_ROOT_COMMAND to support sudo.
+ * functions/package.sh:
+ - Added. Helper dependencies in-chroot can now be handled by
+ functions.
+ * helpers/make-live:
+ - Added trap to unmount proc and sys on exit and failure.
+ * Uploaded 1.0~a7-1.
+
+2007-04-22 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - In ubuntu mode, setting default sections to main restricted.
+ * helpers/lh_binary_grub:
+ - Making copy call of grub arch independent.
+ * helpers/lh_chroot_sources:
+ - In debian mode, checking for non-sid rather than if-etch.
+ - Fixed wrong Ubuntu security URL.
+
+2007-04-20 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_rootfs, lh_binary_iso:
+ - Added mksquashfs/genisoimage quiet/verbose options.
+
+2007-04-19 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_grub, lh_binary_syslinux:
+ - Added check for splash in config directory.
+
+2007-04-18 Daniel Baumann <daniel at debian.org>
+
+ * debian/cron.daily, default:
+ - Added.
+ * doc/BUGS, DOWNLOAD:
+ - Added.
+ * examples/edu.sources.list, fai.sources.list:
+ - Added.
+ * manpages/*:
+ - Added language suffix.
+ - Added German translations.
+
+2007-04-17 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_chroot_hooks:
+ - Also check for tasks specific hooks, not just for package lists.
+ * helpers/lh_chroot_tasks:
+ - Allowing to use either aptitude or tasksel.
+ * hooks/kde-desktop:
+ - Added.
+ * manpages/lh_build.1, lh_source.1:
+ - Added.
+
+2007-04-16 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Using lsb_release, if existing, to set default mode to ubuntu on
+ ubuntu systems.
+ - Moved desktop task to the end, so that gdm doesn't take
+ gnome-session as default.
+ * helpers/lh_chroot_hooks:
+ - Added simple --hooks for easy testing.
+ * Uploaded 1.0~a6-1.
+
+2007-04-15 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Set LH_APT to apt-get when using mini or minimal.
+ * helpers/lh_chroot_sources:
+ - Excluding comments from local sources lists.
+ * helpers/lh_bootstrap_cdebootstrap:
+ - Removing imported configuration files by cdebootstrap.
+
+2007-04-13 Daniel Baumann <daniel at debian.org>
+
+ * Moved examples from /usr/share/doc to /usr/share/live-helper.
+ * examples/bpo.sources.list:
+ - Added.
+ * functions/defaults.sh:
+ - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
+ * helpers/lh_clean:
+ - Added missing removal of generic source.
+
+2007-04-12 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_config, make-live:
+ - Adding --config.
+ * helpers/lh_binary_memtester86:
+ - Renamed to lh_binary_memtest, made more generic.
+ * functions/defaults.sh:
+ - Setting default distribution to etch until 2.6.20 has setteled in
+ unstable.
+
+2007-04-11 Daniel Baumann <daniel at debian.org>
+
+ * Merging from sidux fllbuilder 1.0.4:
+ - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
+ - helpers/lh_chroot_linuximage: Added additional options to
+ kernel-img.conf.
+ - helpers/lh_chroot_proc: Made binfmt umount conditional.
+ * contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+ - Added.
+ * helpers/lh_binary_grub, lh_binary_syslinux:
+ - Added failsafe kernel entries.
+ * helpers/lh_chroot_apt:
+ - Using apt.conf.d also for apt, not just for aptitude.
+ - Minor code cleanup.
+ * helpers/lh_source_*:
+ - Minor code cleanup.
+ * helpers/lh_source_download:
+ - Added LIVE_BOOTLOADER to the list of source packages.
+ * contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+ - Added.
+
+2007-04-10 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_includes, includes/*:
+ - Redone.
+
+2007-04-09 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_yaboot, templates/yaboot:
+ - Added.
+
+2007-04-09 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_config, make-live, functions/defaults.sh:
+ - Added mode to distinguish between Debian and Ubuntu.
+ * helpers/lh_chroot_sources:
+ - Added check for LIVE_MIRROR_BUILD* to be equal to
+ LIVE_MIRROR_IMAGE*.
+ * Uploaded 1.0~a5-1.
+
+2007-04-08 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_net:
+ - Added check for namespace collision with LIVE_SERVER_PATH.
+ * helpers/lh_binary_grub:
+ - Added functionality for usb|hdd images.
+
+2007-04-07 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_chroot_sources:
+ - Moved check for local source lists from
+ config/sources.lists.{build,image} to
+ config/chroot_sources/*.{build,image}.
+ - Added check for local gpg keys in
+ config/chroot_sources/*.{build,image}.gpg.
+ - Added check for local keyring packages in
+ config/chroot_sources/*.deb.
+ - Added LIVE_KEYRING_PACKAGES.
+
+2007-04-06 Daniel Baumann <daniel at debian.org>
+
+ * functions/breakpoints.sh, helpers/*:
+ - Added initial breakpoints.
+ * functions/chroot.sh:
+ - Adding /usr/local to path.
+ * functions/lockfile.sh:
+ - Added additional signals to the trap.
+ * helpers/lh_binary_includes:
+ - Respect LIVE_INCLUDES=none.
+ * manpages/*:
+ - Updated.
+
+2007-04-05 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_grub, templates/grub/menu.lst:
+ - Added splash functionality.
+ * Uploaded 1.0~a4-1.
+
+2007-04-03 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_grub, lh_binary_grub:
+ - Added check for LIVE_TEMPLATES to be existing.
+ * helpers/lh_binary_includes:
+ - Added check for LIVE_INCLUDES to be existing.
+
+2007-04-02 Daniel Baumann <daniel at debian.org>
+
+ * functions/*, helpers/*:
+ - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
+ * helpers/lh_binary_iso:
+ - Added exclude for the bootloader from the iso image content.
+
+2007-04-01 Daniel Baumann <daniel at debian.org>
+
+ * helper/lh_binary_grub:
+ - Added.
+
+2007-03-30 Daniel Baumann <daniel at debian.org>
+
+ * helper/lh_chroot_localincludes:
+ - Fixed wrong path for hook removal.
+
+2007-03-29 Daniel Baumann <daniel at debian.org>
+
+ * functions/common.sh, echo.sh:
+ - Added.
+ * doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
+ - Added forgotten helpers.
+ * doc/FAQ:
+ - Added.
+ * lists/mini, minimal:
+ - Added --yes to apt call to make them non-interactive.
+ * manpages/lh_chroot.1:
+ - Added.
+
+2007-03-28 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
+ - Added --debug, --quiet, and --verbose.
+
+2007-03-27 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_linuximage, lh_binary_memtest86:
+ - Added missing Read_conffiles to fix foreign architecture builds.
+
+2007-03-26 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
+ lh_clean:
+ - Added routine to cache bootstrapped chroot as suggested by Kai
+ Hendry <hendry at iki.fi>.
+ * helpers/lh_chroot_rootfs:
+ - Fixed typo in net type.
+ * lists/gnome*, kde*, standard-x11, xfce*:
+ - Added menu.
+
+2007-03-26 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Fixed handling of desktop list variable loop.
+ * Uploaded 1.0~a3-1.
+
+2007-03-25 Daniel Baumann <daniel at debian.org>
+
+ * functions/*, helpers/*:
+ - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
+ - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
+ * functions/cache.sh:
+ - Added.
+ * helpers/lh_bootstrap_cdebootstrap:
+ - Added removal of cdebootstrap-helper-diverts.
+ * helpers/lh_binary_chroot:
+ - Added.
+ * helpers/lh_binary_rootfs:
+ - Moved filesystem routines into chroot.
+ * helpers/lh_chroot_localization, lh_chroot_localpackages,
+ lh_chroot_localpackageslists, lh_chroot_packages,
+ lh_chroot_packageslists, lh_chroot_tasks:
+ - Added check for LH_CACHE.
+ * helpers/lh_chroot_apt:
+ - Removing old apt.conf if existing as suggested by Ben Armstrong
+ <synrg at debian.org>.
+ * helpers/lh_chroot_hacks:
+ - Added check for already installed smbfs.
+ - Added check for already configured initramfs.conf as suggested by
+ Ben Armstrong <synrg at debian.org>.
+ * helpers/lh_chroot_interactive:
+ - Added.
+ * helpers/lh_chroot_tasks:
+ - Added routine for LH_APT=apt.
+ * lists/minimal-net:
+ - Minimized.
+
+2007-03-24 Daniel Baumann <daniel at debian.org>
+
+ * functions/*, helpers/*, hooks/*:
+ - Added GPL blurb.
+ * functions/arguments.sh, helpers/*:
+ - Added common arguments.
+ * functions/arguments.sh, stagefile.sh, helpers/*,
+ manpages/live-helper.7:
+ - Added --force option.
+ * functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
+ make-live:
+ - Added LIVE_USERNAME and LIVE_HOSTNAME.
+ * helpers/lh_binary_linuximage, lh_binary_memtest86,
+ lh_binary_syslinux:
+ - Moved kernel directory to live.
+ * helpers/lh_clean:
+ - Added purge.
+
+2007-03-23 Daniel Baumann <daniel at debian.org>
+
+ * helpers/make-live:
+ - Calling Arguments twice to catch case with non-default root.
+
+2007-03-22 Daniel Baumann <daniel at debian.org>
+
+ * functions/default.sh, helpers/*:
+ - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
+ lh_chroot_localpackageslist to lh_chroot_localpackageslists
+ * helpers/lh_binary_includes:
+ - Using LIVE_INCLUDES now.
+ * helpers/lh_chroot_apt:
+ - Added LH_APT_SECURE.
+ * helpers/lh_chroot_linuximage:
+ - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
+ local packages.
+
+2007-03-21 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
+ - Checking earlier if there is something todo.
+ * helpers/lh_binary_linuximage, lh_binary_syslinux,
+ lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
+ - Extended to support multiple kernels at once.
+ * helpers/lh_binary_includes, lh_binary_localincludes,
+ lh_chroot_localincludes:
+ - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
+ * helpers/lh_source_md5sum:
+ - Added.
+ * helpers/make-live:
+ - Added short options in ARGUMENTS.
+ * functions/defaults.sh, helpers/*:
+ - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
+ - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
+ LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
+
+2007-03-20 Daniel Baumann <daniel at debian.org>
+
+ * helpers/make-live:
+ - Fixed typo in ARGUMENTS.
+
+2007-03-19 Daniel Baumann <daniel at debian.org>
+
+ * lists/gnome*, kde*, standard-x11, xfce*:
+ - Added alsa-base, alsa-oss, alsa-utils, and discover.
+
+2007-03-19 Daniel Baumann <daniel at debian.org>
+
+ * Uploaded 1.0~a2-1.
+
+2007-03-18 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Quoted date call in LIVE_ISO_VOLUME.
+ * manpages/lh_clean.1:
+ - Added.
+
+2007-03-17 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh, helpers/*:
+ - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
+ to LIVE_MIRROR_LOCAL_SECURITY.
+ * doc/examples/beryl-hook.sh:
+ - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
+ * helpers/lh_config, make-live:
+ - Added check for newconfig to prevent overwriting of non-specified
+ options to default values.
+ * helpers/lh_chroot_localhooks:
+ - Added basename where needed.
+ * helpers/lh_chroot_sources:
+ - Added check for local sources.list in config for custom
+ repositories.
+ - Replaced security check for etch with check for not-unstable.
+ * manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
+ lh_bootstrap_debootstrap.1, lh_testroot.1:
+ - Added.
+ * templates/syslinux/pxlinux.cfg:
+ - Fixed path.
+
+2007-03-16 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_usb: Corrected stagefile creation.
+
+2007-03-15 Daniel Baumann <daniel at debian.org>
+
+ * Makefile:
+ - Replaced helper uninstall routine with a less intrusive one.
+ * doc/NEWS:
+ - Updated.
+ * functions/conffile.sh:
+ - Beautified.
+ * functions/defaults.sh:
+ - Added LH_LOSETUP.
+ * functions/lockfile.sh:
+ - Beautified.
+ * helpers/*:
+ - Allowing apt-get, not just apt in LH_APT.
+ * helpers/lh_config:
+ - Added check for existing configuration.
+ * helpers/lh_binary_md5sum:
+ - Removed legacy code.
+ * helpers/lh_binary_manifest:
+ - Added creation of packages.txt.
+ * helpers/lh_binary_usb, lh_source_usb:
+ - Replaced loop device node workaround with a better one.
+ * helpers/lh_chroot_hooks, lh_chroot_localhooks:
+ - Fixed executable check.
+ * helpers/lh_source_config:
+ - Added.
+ * helpers/lh_source_download:
+ - Separeted debian sources and debian-live configuration into
+ different directories.
+ - Added live-helper to the sources.
+ * helpers/lh_source_generic, lh_source_iso, lh_source_usb,
+ lh_source_net:
+ - Removed annyoing warning when sources are disabled.
+ * helpers/lh_source_net:
+ - Beautified.
+ * helpers/make-live:
+ - Fixed typo in ARGUMENTS.
+ - Moved help, usage, version into functions.
+ - Removed build pre-option.
+ * manpages/live-helper.7:
+ - Added.
+ * templates/syslinux/f10.txt:
+ - Added note about Debian Live project.
+
+2007-03-14 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh, helpers/*:
+ - Converted LIVE_ROOT to directory, not full path.
+ * functions/*, helpers/*:
+ - Replaced LIVE_CHROOT with directory name.
+ * functions/conffile.sh:
+ - Added warning if CONFFILE is not readable.
+ * helpers/lh_chroot_localization:
+ - Completed check for koffice.
+ * helpers/lh_source_download:
+ - Fixed typo in old source removal.
+
+2007-03-14 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_chroot_hacks:
+ - Added removal of udev persistent-net rule.
+ * Uploaded 1.0~a1-3.
+
+2007-03-14 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Fixed setting of LIVE_SYSVINIT.
+ * helpers/lh_chroot_sysvinit:
+ - Changed check for LIVE_SYSVINIT from disabled to enabled.
+ * Uploaded 1.0~a1-2.
+
+2007-03-12 Daniel Baumann <daniel at debian.org>
+
+ * Rewritten live-package.
+ * Uploaded 1.0~a1-1.
Deleted: releases/live-helper/1.0~a20-1/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/functions/defaults.sh 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,683 +0,0 @@
-#!/bin/sh
-
-# defaults.sh - handle default values
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Set_defaults ()
-{
- ## config/common
-
- # Setting mode
- if [ -z "${LH_MODE}" ]
- then
- if [ -x /usr/bin/lsb_release ]
- then
- case "`lsb_release --short --id`" in
- Debian)
- LH_MODE="debian"
- ;;
-
- Ubuntu)
- LH_MODE="ubuntu"
- ;;
-
- *)
- Echo_verbose "Unexpected output from lsb_release"
- Echo_verbose "Setting mode to debian."
- LH_MODE="debian"
- ;;
- esac
- else
- LH_MODE="debian"
- fi
- fi
-
- # Setting distribution name
- if [ -z "${LIVE_DISTRIBUTION}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_DISTRIBUTION="etch"
- ;;
-
- ubuntu)
- LIVE_DISTRIBUTION="feisty"
- ;;
- esac
- fi
-
- # Setting package manager
- LH_APT="${LH_APT:-aptitude}"
-
- # Setting apt ftp proxy
- if [ -z "${LH_APT_FTPPROXY}" ] && [ -n "${ftp_proxy}" ]
- then
- LH_APT_FTPPROXY="${ftp_proxy}"
- else
- if [ -n "${LH_APT_FTPPROXY}" ] && [ "${LH_APT_FTPRPOXY}" != "${ftp_proxy}" ]
- then
- ftp_proxy="${LH_APT_FTPRPOXY}"
- fi
- fi
-
- # Setting apt http proxy
- if [ -z "${LH_APT_HTTPPROXY}" ] && [ -n "${http_proxy}" ]
- then
- LH_APT_HTTPPROXY="${http_proxy}"
- else
- if [ -n "${LH_APT_HTTPPROXY}" ] && [ "${LH_APT_HTTPRPOXY}" != "${http_proxy}" ]
- then
- http_proxy="${LH_APT_HTTPPROXY}"
- fi
- fi
-
- # Setting apt pdiffs
- LH_APT_PDIFFS="${LH_APT_PDIFFS:-enabled}"
-
- # Setting apt pipeline
- # LH_APT_PIPELINE
-
- # Setting apt recommends
- LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
-
- # Setting apt secure
- LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
-
- # Setting bootstrap program
- if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "`which ${LH_BOOTSTRAP}`" ]
- then
- case "${LH_MODE}" in
- debian)
- if [ -x "/usr/bin/cdebootstrap" ]
- then
- LH_BOOTSTRAP="cdebootstrap"
- elif [ -x "/usr/sbin/debootstrap" ]
- then
- LH_BOOTSTRAP="debootstrap"
- else
- echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)"
- exit 1
- fi
- ;;
-
- ubuntu)
- if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
- then
- LH_BOOTSTRAP="cdebootstrap"
- elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
- then
- LH_BOOTSTRAP="debootstrap"
- else
- echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
- exit 1
- fi
- ;;
- esac
- fi
-
- # Setting cache option
- LH_CACHE_INDICES="${LH_CACHE_INDICES:-disabled}"
- LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-enabled}"
- LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}"
-
- # Setting debconf frontend
- LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND:-noninteractive}"
- LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
- LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}"
-
- case "${LH_DEBCONF_NOWARNINGS}" in
- enabled)
- LH_DEBCONF_NOWARNINGS="yes"
- ;;
-
- disabled)
- LH_DEBCONF_NOWARNINGS="no"
- ;;
- esac
-
- # Setting genisoimage
- if [ -z "${LH_GENISOIMAGE}" ]
- then
- case "${LH_MODE}" in
- debian)
- LH_GENISOIMAGE="genisoimage"
- ;;
-
- ubuntu)
- LH_GENISOIMAGE="mkisofs"
- ;;
- esac
- fi
-
- # Setting initramfs hook
- if [ -z "${LH_INITRAMFS}" ]
- then
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- LH_INITRAMFS="casper"
- else
- LH_INITRAMFS="live-initramfs"
- fi
- fi
-
- # Setting losetup
- if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
- then
- # Workaround for loop-aes-utils divertion
- if [ -x /sbin/losetup.orig ]
- then
- LH_LOSETUP="losetup.orig"
- elif [ -x /sbin/losetup ]
- then
- LH_LOSETUP="losetup"
- else
- echo "E: Can't process file /sbin/losetup (FIXME)"
- fi
- fi
-
- if [ "`id -u`" = "0" ]
- then
- # If we are root, disable root command
- LIVE_ROOT_COMMAND=""
- else
- if [ -x /usr/bin/sudo ]
- then
- # FIXME: this is disabled until considered safe
- #LIVE_ROOT_COMMAND="sudo"
- LIVE_ROOT_COMMAND=""
- fi
- fi
-
- # Setting tasksel
- LH_TASKSEL="${LH_TASKSEL:-aptitude}"
-
- # Setting root directory
- if [ -z "${LIVE_ROOT}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_ROOT="debian-live"
- ;;
-
- ubuntu)
- LIVE_ROOT="ubuntu-live"
- ;;
- esac
- fi
-
- # Setting includes
- if [ -z "${LIVE_INCLUDES}" ]
- then
- LIVE_INCLUDES="${LH_BASE:-/usr/share/live-helper}/includes"
- fi
-
- # Setting templates
- if [ -z "${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="${LH_BASE:-/usr/share/live-helper}/templates"
- fi
-
- # Setting live helper options
- LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}"
- LH_DEBUG="${LH_DEBUG:-disabled}"
- LH_FORCE="${LH_FORCE:-disabled}"
- LH_QUIET="${LH_QUIET:-disabled}"
- LH_VERBOSE="${LH_VERBOSE:-disabled}"
-
- ## config/bootstrap
-
- # Setting architecture value
- if [ -z "${LIVE_ARCHITECTURE}" ]
- then
- if [ -x "/usr/bin/dpkg" ]
- then
- LIVE_ARCHITECTURE="`dpkg --print-architecture`"
- else
- echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
- LIVE_ARCHITECTURE="i386"
- fi
- fi
-
- # Setting distribution configuration value
- # LIVE_BOOTSTRAP_CONFIG
-
- # Setting flavour value
- LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR:-standard}"
-
- # Setting boostrap keyring
- # LIVE_BOOTSTRAP_KEYRING
-
- # Setting mirror to fetch packages from
- if [ -z "${LIVE_MIRROR_BOOTSTRAP}" ]
- then
- case "${LH_MODE}" in
- debian)
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386)
- LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
- ;;
-
- *)
- LIVE_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
- ;;
- esac
- ;;
-
- ubuntu)
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
- ;;
-
- hppa|ia64)
- LIVE_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
- ;;
-
- *)
- Echo_error "There is no port of Ubuntu available for your architecture."
- exit 1
- ;;
- esac
- ;;
- esac
- fi
-
- # Setting security mirror to fetch packages from
- if [ -z "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
- ;;
-
- ubuntu)
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://archive.ubuntu.com/ubuntu/"
- ;;
-
- hppa|ia64)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://ports.ubuntu.com/"
- ;;
-
- *)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="none"
- ;;
- esac
- ;;
- esac
- fi
-
- # Setting mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_BINARY}" ]
- then
- case "${LH_MODE}" in
- debian)
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386)
- LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
- ;;
-
- *)
- LIVE_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
- ;;
- esac
- ;;
-
- ubuntu)
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
- ;;
-
- hppa|ia64)
- LIVE_MIRROR_BINARY="http://ports.ubuntu.com/"
- ;;
-
- *)
- Echo_error "There is no port of Ubuntu available for your architecture."
- exit 1
- ;;
- esac
- ;;
- esac
- fi
-
- # Setting security mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_BINARY_SECURITY}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BINARY_SECURITY="http://security.debian.org/"
- ;;
-
- ubuntu)
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386|powerpc|sparc)
- LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
- ;;
-
- *)
- LIVE_MIRROR_BINARY_SECURITY="none"
- ;;
- esac
- ;;
- esac
- fi
-
- # Setting sections value
- if [ -z "${LIVE_SECTIONS}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_SECTIONS="main"
- ;;
-
- ubuntu)
- LIVE_SECTIONS="main restricted"
- ;;
- esac
- fi
-
- ## config/chroot
-
- # Setting chroot filesystem
- LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}"
-
- # Setting union filesystem
- LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM:-unionfs}"
-
- # LIVE_HOOKS
-
- # Setting interactive shell/X11/Xnest
- LIVE_INTERACTIVE="${LIVE_INTERACTIVE:-disabled}"
-
- # Setting keyring packages
- # LIVE_KEYRING_PACKAGES
-
- # Setting language string
- # LIVE_LANGUAGE
-
- # Setting linux flavour string
- if [ -z "${LIVE_LINUX_FLAVOURS}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- alpha)
- LIVE_LINUX_FLAVOURS="alpha-generic"
- ;;
-
- amd64)
- case "${LH_MODE}" in
- debian)
- LIVE_LINUX_FLAVOURS="amd64"
- ;;
-
- ubuntu)
- LIVE_LINUX_FLAVOURS="amd64-generic"
- ;;
- esac
- ;;
-
- arm)
- Echo_error "You need to specify the linux kernel flavour manually on arm (FIXME)."
- exit 1
- ;;
-
- hppa)
- LIVE_LINUX_FLAVOURS="parisc"
- ;;
-
- i386)
- case "${LH_MODE}" in
- debian)
- LIVE_LINUX_FLAVOURS="486"
- ;;
-
- ubuntu)
- LIVE_LINUX_FLAVOURS="386"
- ;;
- esac
- ;;
-
- ia64)
- LIVE_LINUX_FLAVOURS="itanium"
- ;;
-
- m68k)
- LIVE_LINUX_FLAVOURS="You need to specify the linux kernel flavour manually on m68k."
- exit 1
- ;;
-
- powerpc)
- LIVE_LINUX_FLAVOURS="powerpc"
- ;;
-
- s390)
- LIVE_LINUX_FLAVOURS="s390"
- ;;
-
- sparc)
- case "${LH_MODE}" in
- debian)
- LIVE_LINUX_FLAVOURS="sparc32"
- # FIXME: needs update after etch
- ;;
-
- ubuntu)
- LIVE_LINUX_FLAVOURS="sparc64"
- ;;
- esac
- ;;
-
- *)
- Echo_error "Architecture notyet supported (FIXME)"
- ;;
- esac
- fi
-
- # Set linux packages
- if [ -z "${LIVE_LINUX_PACKAGES}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_LINUX_PACKAGES="linux-image-2.6 ${LIVE_UNION_FILESYSTEM}-modules-2.6"
-
- if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ]
- then
- LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} squashfs-modules-2.6"
- fi
- ;;
-
- ubuntu)
- LIVE_LINUX_PACKAGES="linux-image"
- ;;
- esac
-
- if [ -n "${LIVE_ENCRYPTION}" ]
- then
- LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
- fi
- fi
-
- # Setting packages string
- # LIVE_PACKAGES
-
- # Setting packages list string
- LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
-
- # Setting package preseed
- # LIVE_PRESEED
-
- # Setting tasks string
- for LIST in ${LIVE_PACKAGES_LISTS}
- do
- case "${LIST}" in
- mini|minimal)
- LH_APT="apt-get"
- ;;
-
- gnome-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
- ;;
-
- kde-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
- ;;
-
- xfce-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
- ;;
- esac
- done
-
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
-
- # Setting tasks
- # LIVE_TASKS
-
- # Setting security updates option
- if [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "none" ] || [ "${LIVE_MIRROR_BINARY_SECURITY}" = "none" ]
- then
- LIVE_SECURITY="disabled"
- fi
-
- LIVE_SECURITY="${LIVE_SECURITY:-enabled}"
-
- # Setting symlink convertion option
- LIVE_SYMLINKS="${LIVE_SYMLINKS:-disabled}"
-
- # Setting sysvinit option
- LIVE_SYSVINIT="${LIVE_SYSVINIT:-disabled}"
-
- ## config/binary
-
- # Setting image type
- LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES:-iso}"
-
- # Setting apt indices
- LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES:-enabled}"
-
- # Setting boot parameters
- # LIVE_BOOTAPPEND
-
- # Setting bootloader
- if [ -z "${LIVE_BOOTLOADER}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64|i386)
- LIVE_BOOTLOADER="syslinux"
- ;;
-
- powerpc)
- LIVE_BOOTLOADER="yaboot"
- ;;
- esac
- fi
-
- # Setting chroot option
- LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD:-enabled}"
-
- # Setting debian-installer option
- LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
-
- # Setting encryption
- # LIVE_ENCRYPTION
-
- # Setting grub splash
- # LIVE_GRUB_SPLASH
-
- # Setting hostname
- if [ -z "${LIVE_HOSTNAME}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_HOSTNAME="debian"
- ;;
-
- ubuntu)
- LIVE_HOSTNAME="ubuntu"
- ;;
- esac
- fi
-
- # Setting iso author
- if [ -z "${LIVE_ISO_APPLICATION}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_ISO_APPLICATION="Debian Live"
- ;;
-
- ubuntu)
- LIVE_ISO_APPLICATION="Ubuntu Live"
- ;;
- esac
- fi
-
- # Set iso preparer
- LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER:-live-helper ${VERSION}; http://packages.qa.debian.org/live-helper}"
-
- # Set iso publisher
- LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org}"
-
- # Setting iso volume
- if [ -z "${LIVE_ISO_VOLUME}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
- ;;
-
- ubuntu)
- LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
- ;;
- esac
- fi
-
- # Setting memtest option
- LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}"
-
- # Setting netboot filesystem
- LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM:-nfs}"
-
- # Setting netboot server path
- if [ -z "${LIVE_NET_PATH}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_NET_PATH="/srv/debian-live"
- ;;
-
- ubuntu)
- LIVE_NET_PATH="/srv/ubuntu-live"
- ;;
- esac
- fi
-
- # Setting netboot server address
- LIVE_NET_SERVER="${LIVE_NET_SERVER:-192.168.1.1}"
-
- # Setting syslinux splash
- # LIVE_SYSLINUX_SPLASH
-
- # Setting username
- LIVE_USERNAME="${LIVE_USERNAME:-user}"
-
- ## config/source
-
- # Setting source option
- LIVE_SOURCE="${LIVE_SOURCE:-disabled}"
-
- # Setting image type
- LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-tar}"
-}
Copied: releases/live-helper/1.0~a20-1/functions/defaults.sh (from rev 2598, dists/trunk/live-helper/functions/defaults.sh)
===================================================================
--- releases/live-helper/1.0~a20-1/functions/defaults.sh (rev 0)
+++ releases/live-helper/1.0~a20-1/functions/defaults.sh 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,680 @@
+#!/bin/sh
+
+# defaults.sh - handle default values
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+Set_defaults ()
+{
+ ## config/common
+
+ # Setting mode
+ if [ -z "${LH_MODE}" ]
+ then
+ if [ -x /usr/bin/lsb_release ]
+ then
+ case "`lsb_release --short --id`" in
+ Debian)
+ LH_MODE="debian"
+ ;;
+
+ Ubuntu)
+ LH_MODE="ubuntu"
+ ;;
+
+ *)
+ Echo_verbose "Unexpected output from lsb_release"
+ Echo_verbose "Setting mode to debian."
+ LH_MODE="debian"
+ ;;
+ esac
+ else
+ LH_MODE="debian"
+ fi
+ fi
+
+ # Setting distribution name
+ if [ -z "${LIVE_DISTRIBUTION}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_DISTRIBUTION="etch"
+ ;;
+
+ ubuntu)
+ LIVE_DISTRIBUTION="feisty"
+ ;;
+ esac
+ fi
+
+ # Setting package manager
+ LH_APT="${LH_APT:-aptitude}"
+
+ # Setting apt ftp proxy
+ if [ -z "${LH_APT_FTPPROXY}" ] && [ -n "${ftp_proxy}" ]
+ then
+ LH_APT_FTPPROXY="${ftp_proxy}"
+ else
+ if [ -n "${LH_APT_FTPPROXY}" ] && [ "${LH_APT_FTPRPOXY}" != "${ftp_proxy}" ]
+ then
+ ftp_proxy="${LH_APT_FTPRPOXY}"
+ fi
+ fi
+
+ # Setting apt http proxy
+ if [ -z "${LH_APT_HTTPPROXY}" ] && [ -n "${http_proxy}" ]
+ then
+ LH_APT_HTTPPROXY="${http_proxy}"
+ else
+ if [ -n "${LH_APT_HTTPPROXY}" ] && [ "${LH_APT_HTTPRPOXY}" != "${http_proxy}" ]
+ then
+ http_proxy="${LH_APT_HTTPPROXY}"
+ fi
+ fi
+
+ # Setting apt pdiffs
+ LH_APT_PDIFFS="${LH_APT_PDIFFS:-enabled}"
+
+ # Setting apt pipeline
+ # LH_APT_PIPELINE
+
+ # Setting apt recommends
+ LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
+
+ # Setting apt secure
+ LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
+
+ # Setting bootstrap program
+ if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "`which ${LH_BOOTSTRAP}`" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ if [ -x "/usr/bin/cdebootstrap" ]
+ then
+ LH_BOOTSTRAP="cdebootstrap"
+ elif [ -x "/usr/sbin/debootstrap" ]
+ then
+ LH_BOOTSTRAP="debootstrap"
+ else
+ echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)"
+ exit 1
+ fi
+ ;;
+
+ ubuntu)
+ if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
+ then
+ LH_BOOTSTRAP="cdebootstrap"
+ elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
+ then
+ LH_BOOTSTRAP="debootstrap"
+ else
+ echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
+ exit 1
+ fi
+ ;;
+ esac
+ fi
+
+ # Setting cache option
+ LH_CACHE_INDICES="${LH_CACHE_INDICES:-disabled}"
+ LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-enabled}"
+ LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}"
+
+ # Setting debconf frontend
+ LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND:-noninteractive}"
+ LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
+ LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}"
+
+ case "${LH_DEBCONF_NOWARNINGS}" in
+ enabled)
+ LH_DEBCONF_NOWARNINGS="yes"
+ ;;
+
+ disabled)
+ LH_DEBCONF_NOWARNINGS="no"
+ ;;
+ esac
+
+ # Setting genisoimage
+ if [ -z "${LH_GENISOIMAGE}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LH_GENISOIMAGE="genisoimage"
+ ;;
+
+ ubuntu)
+ LH_GENISOIMAGE="mkisofs"
+ ;;
+ esac
+ fi
+
+ # Setting initramfs hook
+ if [ -z "${LH_INITRAMFS}" ]
+ then
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ LH_INITRAMFS="casper"
+ else
+ LH_INITRAMFS="live-initramfs"
+ fi
+ fi
+
+ # Setting losetup
+ if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
+ then
+ # Workaround for loop-aes-utils divertion
+ if [ -x /sbin/losetup.orig ]
+ then
+ LH_LOSETUP="losetup.orig"
+ elif [ -x /sbin/losetup ]
+ then
+ LH_LOSETUP="losetup"
+ else
+ echo "E: Can't process file /sbin/losetup (FIXME)"
+ fi
+ fi
+
+ if [ "`id -u`" = "0" ]
+ then
+ # If we are root, disable root command
+ LIVE_ROOT_COMMAND=""
+ else
+ if [ -x /usr/bin/sudo ]
+ then
+ # FIXME: this is disabled until considered safe
+ #LIVE_ROOT_COMMAND="sudo"
+ LIVE_ROOT_COMMAND=""
+ fi
+ fi
+
+ # Setting tasksel
+ LH_TASKSEL="${LH_TASKSEL:-aptitude}"
+
+ # Setting root directory
+ if [ -z "${LIVE_ROOT}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_ROOT="debian-live"
+ ;;
+
+ ubuntu)
+ LIVE_ROOT="ubuntu-live"
+ ;;
+ esac
+ fi
+
+ # Setting includes
+ if [ -z "${LIVE_INCLUDES}" ]
+ then
+ LIVE_INCLUDES="${LH_BASE:-/usr/share/live-helper}/includes"
+ fi
+
+ # Setting templates
+ if [ -z "${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="${LH_BASE:-/usr/share/live-helper}/templates"
+ fi
+
+ # Setting live helper options
+ LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}"
+ LH_DEBUG="${LH_DEBUG:-disabled}"
+ LH_FORCE="${LH_FORCE:-disabled}"
+ LH_QUIET="${LH_QUIET:-disabled}"
+ LH_VERBOSE="${LH_VERBOSE:-disabled}"
+
+ ## config/bootstrap
+
+ # Setting architecture value
+ if [ -z "${LIVE_ARCHITECTURE}" ]
+ then
+ if [ -x "/usr/bin/dpkg" ]
+ then
+ LIVE_ARCHITECTURE="`dpkg --print-architecture`"
+ else
+ echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
+ LIVE_ARCHITECTURE="i386"
+ fi
+ fi
+
+ # Setting distribution configuration value
+ # LIVE_BOOTSTRAP_CONFIG
+
+ # Setting flavour value
+ LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR:-standard}"
+
+ # Setting boostrap keyring
+ # LIVE_BOOTSTRAP_KEYRING
+
+ # Setting mirror to fetch packages from
+ if [ -z "${LIVE_MIRROR_BOOTSTRAP}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386)
+ LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+ ;;
+
+ *)
+ LIVE_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+ ;;
+ esac
+ ;;
+
+ ubuntu)
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386|powerpc|sparc)
+ LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
+ ;;
+
+ hppa|ia64)
+ LIVE_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
+ ;;
+
+ *)
+ Echo_error "There is no port of Ubuntu available for your architecture."
+ exit 1
+ ;;
+ esac
+ ;;
+ esac
+ fi
+
+ # Setting security mirror to fetch packages from
+ if [ -z "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
+ ;;
+
+ ubuntu)
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386|powerpc|sparc)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="http://archive.ubuntu.com/ubuntu/"
+ ;;
+
+ hppa|ia64)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="http://ports.ubuntu.com/"
+ ;;
+
+ *)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="none"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+
+ # Setting mirror which ends up in the image
+ if [ -z "${LIVE_MIRROR_BINARY}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386)
+ LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
+ ;;
+
+ *)
+ LIVE_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
+ ;;
+ esac
+ ;;
+
+ ubuntu)
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386|powerpc|sparc)
+ LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
+ ;;
+
+ hppa|ia64)
+ LIVE_MIRROR_BINARY="http://ports.ubuntu.com/"
+ ;;
+
+ *)
+ Echo_error "There is no port of Ubuntu available for your architecture."
+ exit 1
+ ;;
+ esac
+ ;;
+ esac
+ fi
+
+ # Setting security mirror which ends up in the image
+ if [ -z "${LIVE_MIRROR_BINARY_SECURITY}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+ ;;
+
+ ubuntu)
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386|powerpc|sparc)
+ LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
+ ;;
+
+ *)
+ LIVE_MIRROR_BINARY_SECURITY="none"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+
+ # Setting sections value
+ if [ -z "${LIVE_SECTIONS}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_SECTIONS="main"
+ ;;
+
+ ubuntu)
+ LIVE_SECTIONS="main restricted"
+ ;;
+ esac
+ fi
+
+ ## config/chroot
+
+ # Setting chroot filesystem
+ LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}"
+
+ # Setting union filesystem
+ LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM:-unionfs}"
+
+ # LIVE_HOOKS
+
+ # Setting interactive shell/X11/Xnest
+ LIVE_INTERACTIVE="${LIVE_INTERACTIVE:-disabled}"
+
+ # Setting keyring packages
+ # LIVE_KEYRING_PACKAGES
+
+ # Setting language string
+ # LIVE_LANGUAGE
+
+ # Setting linux flavour string
+ if [ -z "${LIVE_LINUX_FLAVOURS}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ alpha)
+ LIVE_LINUX_FLAVOURS="alpha-generic"
+ ;;
+
+ amd64)
+ case "${LH_MODE}" in
+ debian)
+ LIVE_LINUX_FLAVOURS="amd64"
+ ;;
+
+ ubuntu)
+ LIVE_LINUX_FLAVOURS="amd64-generic"
+ ;;
+ esac
+ ;;
+
+ arm)
+ Echo_error "You need to specify the linux kernel flavour manually on arm (FIXME)."
+ exit 1
+ ;;
+
+ hppa)
+ LIVE_LINUX_FLAVOURS="parisc"
+ ;;
+
+ i386)
+ case "${LH_MODE}" in
+ debian)
+ LIVE_LINUX_FLAVOURS="486"
+ ;;
+
+ ubuntu)
+ LIVE_LINUX_FLAVOURS="386"
+ ;;
+ esac
+ ;;
+
+ ia64)
+ LIVE_LINUX_FLAVOURS="itanium"
+ ;;
+
+ m68k)
+ LIVE_LINUX_FLAVOURS="You need to specify the linux kernel flavour manually on m68k."
+ exit 1
+ ;;
+
+ powerpc)
+ LIVE_LINUX_FLAVOURS="powerpc"
+ ;;
+
+ s390)
+ LIVE_LINUX_FLAVOURS="s390"
+ ;;
+
+ sparc)
+ case "${LH_MODE}" in
+ debian)
+ LIVE_LINUX_FLAVOURS="sparc32"
+ # FIXME: needs update after etch
+ ;;
+
+ ubuntu)
+ LIVE_LINUX_FLAVOURS="sparc64"
+ ;;
+ esac
+ ;;
+
+ *)
+ Echo_error "Architecture notyet supported (FIXME)"
+ ;;
+ esac
+ fi
+
+ # Set linux packages
+ if [ -z "${LIVE_LINUX_PACKAGES}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_LINUX_PACKAGES="linux-image-2.6 ${LIVE_UNION_FILESYSTEM}-modules-2.6"
+
+ if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ]
+ then
+ LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} squashfs-modules-2.6"
+ fi
+ ;;
+
+ ubuntu)
+ LIVE_LINUX_PACKAGES="linux-image"
+ ;;
+ esac
+
+ if [ -n "${LIVE_ENCRYPTION}" ]
+ then
+ LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
+ fi
+ fi
+
+ # Setting packages string
+ # LIVE_PACKAGES
+
+ # Setting packages list string
+ LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
+
+ # Setting tasks string
+ for LIST in ${LIVE_PACKAGES_LISTS}
+ do
+ case "${LIST}" in
+ mini|minimal)
+ LH_APT="apt-get"
+ ;;
+
+ gnome-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
+ ;;
+
+ kde-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
+ ;;
+
+ xfce-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
+ ;;
+ esac
+ done
+
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
+
+ # Setting tasks
+ # LIVE_TASKS
+
+ # Setting security updates option
+ if [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "none" ] || [ "${LIVE_MIRROR_BINARY_SECURITY}" = "none" ]
+ then
+ LIVE_SECURITY="disabled"
+ fi
+
+ LIVE_SECURITY="${LIVE_SECURITY:-enabled}"
+
+ # Setting symlink convertion option
+ LIVE_SYMLINKS="${LIVE_SYMLINKS:-disabled}"
+
+ # Setting sysvinit option
+ LIVE_SYSVINIT="${LIVE_SYSVINIT:-disabled}"
+
+ ## config/binary
+
+ # Setting image type
+ LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES:-iso}"
+
+ # Setting apt indices
+ LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES:-enabled}"
+
+ # Setting boot parameters
+ # LIVE_BOOTAPPEND
+
+ # Setting bootloader
+ if [ -z "${LIVE_BOOTLOADER}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386)
+ LIVE_BOOTLOADER="syslinux"
+ ;;
+
+ powerpc)
+ LIVE_BOOTLOADER="yaboot"
+ ;;
+ esac
+ fi
+
+ # Setting chroot option
+ LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD:-enabled}"
+
+ # Setting debian-installer option
+ LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
+
+ # Setting encryption
+ # LIVE_ENCRYPTION
+
+ # Setting grub splash
+ # LIVE_GRUB_SPLASH
+
+ # Setting hostname
+ if [ -z "${LIVE_HOSTNAME}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_HOSTNAME="debian"
+ ;;
+
+ ubuntu)
+ LIVE_HOSTNAME="ubuntu"
+ ;;
+ esac
+ fi
+
+ # Setting iso author
+ if [ -z "${LIVE_ISO_APPLICATION}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_ISO_APPLICATION="Debian Live"
+ ;;
+
+ ubuntu)
+ LIVE_ISO_APPLICATION="Ubuntu Live"
+ ;;
+ esac
+ fi
+
+ # Set iso preparer
+ LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER:-live-helper ${VERSION}; http://packages.qa.debian.org/live-helper}"
+
+ # Set iso publisher
+ LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org}"
+
+ # Setting iso volume
+ if [ -z "${LIVE_ISO_VOLUME}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
+ ;;
+
+ ubuntu)
+ LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
+ ;;
+ esac
+ fi
+
+ # Setting memtest option
+ LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}"
+
+ # Setting netboot filesystem
+ LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM:-nfs}"
+
+ # Setting netboot server path
+ if [ -z "${LIVE_NET_PATH}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_NET_PATH="/srv/debian-live"
+ ;;
+
+ ubuntu)
+ LIVE_NET_PATH="/srv/ubuntu-live"
+ ;;
+ esac
+ fi
+
+ # Setting netboot server address
+ LIVE_NET_SERVER="${LIVE_NET_SERVER:-192.168.1.1}"
+
+ # Setting syslinux splash
+ # LIVE_SYSLINUX_SPLASH
+
+ # Setting username
+ LIVE_USERNAME="${LIVE_USERNAME:-user}"
+
+ ## config/source
+
+ # Setting source option
+ LIVE_SOURCE="${LIVE_SOURCE:-disabled}"
+
+ # Setting image type
+ LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-tar}"
+}
Deleted: releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="install linux-image into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin install linux-image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_linux-image
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- case "${LH_INITRAMFS}" in
- casper)
- DESTDIR="binary/casper"
- ;;
-
- live-initramfs)
- DESTDIR="binary/live"
- ;;
- esac
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- tar|usb-hdd)
- DESTDIR="binary/live"
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- fi
- ;;
-esac
-
-case "${LIVE_ARCHITECTURE}" in
- amd64)
- LINUX="vmlinuz"
- ;;
-
- i386)
- LINUX="vmlinuz"
- ;;
-
- powerpc)
- LINUX="vmlinux"
- ;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing linux-image
-cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-cp chroot/boot/initrd.img-* "${DESTDIR}"
-
-# Including boot parameter documentation
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
- DESTDIR="binary"
-fi
-
-case "${LH_INITRAMFS}" in
- casper)
- cp "${LH_BASE:-/usr/share/live-helper}"/data/casper/parameters.txt "${DESTDIR}"/parameters.txt
- ;;
-
- live-initramfs)
- cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt
- ;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_linux-image
Copied: releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image (from rev 2598, dists/trunk/live-helper/helpers/lh_binary_linux-image)
===================================================================
--- releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image (rev 0)
+++ releases/live-helper/1.0~a20-1/helpers/lh_binary_linux-image 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# lh_binary_linux-image(1) - install linux-image into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install linux-image into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin install linux-image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_linux-image
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ case "${LH_INITRAMFS}" in
+ casper)
+ DESTDIR="binary/casper"
+ ;;
+
+ live-initramfs)
+ DESTDIR="binary/live"
+ ;;
+ esac
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ ;;
+
+ tar|usb-hdd)
+ DESTDIR="binary/live"
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ fi
+ ;;
+esac
+
+case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ LINUX="vmlinuz"
+ ;;
+
+ i386)
+ LINUX="vmlinuz"
+ ;;
+
+ powerpc)
+ LINUX="vmlinux"
+ ;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing linux-image
+cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
+cp chroot/boot/initrd.img-* "${DESTDIR}"
+
+# Including boot parameter documentation
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+ DESTDIR="binary"
+fi
+
+case "${LH_INITRAMFS}" in
+ casper)
+ # Checking casper templates
+ Check_templates casper
+ cp "${TEMPLATES}"/casper/parameters.txt "${DESTDIR}"/parameters.txt
+ ;;
+
+ live-initramfs)
+ cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt
+ ;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/binary_linux-image
Deleted: releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,538 +0,0 @@
-#!/bin/sh
-
-# lh_binary_syslinux(1) - installs syslinux into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="installs syslinux into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
-then
- exit 0
-fi
-
-Echo_message "Begin installing syslinux..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_syslinux
-
-# Checking syslinux templates
-Check_templates syslinux
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture amd64 i386
-
-# Checking depends
-Check_package chroot/usr/bin/syslinux syslinux
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Syslinux_live_entry ()
-{
- LABEL="${1}"
- KERNEL="${2}"
- INITRD="${3}"
- APPEND="${4}"
-
- # syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_LIVE}`" != "binary" ]
- then
- DIRECTORY="`basename ${DESTDIR_LIVE}`"
- KERNEL="${DIRECTORY}/${KERNEL}"
- INITRD="${DIRECTORY}/${INITRD}"
- fi
-
- LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
-}
-
-Syslinux_install_entry ()
-{
- LABEL="${1}"
- KERNEL="${2}"
- INITRD="${3}"
- APPEND="${4}"
-
- # syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_INSTALL}`" != "binary" ]
- then
- DIRECTORY="`basename ${DESTDIR_INSTALL}`"
- KERNEL="${DIRECTORY}/${KERNEL}"
- INITRD="${DIRECTORY}/${INITRD}"
- fi
-
- # Boot in quiet mode
- if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
- then
- APPEND="${APPEND} quiet"
- fi
-
- LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\tkernel /${KERNEL}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=/${INITRD} ${APPEND} --\n"
-}
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- case "${LH_INITRAMFS}" in
- casper)
- DESTDIR_LIVE="binary/casper"
- ;;
-
- live-initramfs)
- DESTDIR_LIVE="binary/live"
- ;;
- esac
-
- DESTDIR_INSTALL="binary/install"
- ;;
-
- net)
- DESTDIR_LIVE="tftpboot"
- DESTDIR_INSTALL="tftpboot"
- ;;
-
- tar|usb-hdd)
- case "${LH_INITRAMFS}" in
- casper)
- DESTDIR_LIVE="binary/casper"
- ;;
-
- live-initramfs)
- DESTDIR_LIVE="binary/live"
- ;;
- esac
-
- DESTDIR_INSTALL="binary/install"
-
- # syslinux << 3.36 lacks support for long file/path
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- DESTDIR_LIVE="binary"
- DESTDIR_INSTALL="binary"
- fi
- ;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
- 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
- case "${LH_INITRAMFS}" in
- casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
- ;;
-
- live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
- then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
- fi
- ;;
- esac
-fi
-
-if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
-fi
-
-if [ "${LIVE_BINARY_IMAGES}" = "net" ]
-then
- case "${LIVE_NET_FILESYSTEM}" in
- nfs)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH"
- ;;
-
- cifs)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=cifs nfsroot=//LIVE_NET_SERVERLIVE_NET_PATH"
- ;;
-
- *)
- Echo_error "Unsupported net filesystem"
- exit 1
- ;;
- esac
-
- if [ -n "${LIVE_NET_MOUNTOPTIONS}" ]
- then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} nfsopts=${LIVE_NET_MOUNTOPTIONS}"
- fi
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
-DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
-
-Syslinux_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinuz-*
- do
- KERNEL_IMAGE="`basename ${KERNEL}`"
- KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
- INITRD="initrd.img-${KERNEL_VERSION}"
-
- Syslinux_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
- Syslinux_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
- done
-fi
-
-LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
-then
- VMLINUZ_DI="vmlinuz"
- INITRD_DI="initrd.gz"
- APPEND_DI="vga=normal"
-
- VMLINUZ_GI="gtk/vmlinuz"
- INITRD_GI="gtk/initrd.gz"
- APPEND_GI="video=vesa:ywrap,mtrr vga=788"
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
- then
- VMLINUZ_DI="vmlinuz.di"
- INITRD_DI="initrddi.gz"
-
- VMLINUZ_GI="vmlinuz.gi"
- INITRD_GI="initrdgi.gz"
- fi
- fi
-
- Syslinux_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
- Syslinux_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
- Syslinux_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
- Syslinux_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
- Syslinux_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
- Syslinux_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
- Syslinux_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
- Syslinux_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
- Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
-fi
-
-LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
- KERNEL_PATH="/`basename ${DESTDIR_LIVE}`/"
-
- # syslinux << 3.36 lacks support to file/path
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- KERNEL_PATH=""
- fi
-
- MEMTEST="LABEL memtest\n\tkernel ${KERNEL_PATH}memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- # Copying syslinux
- mkdir -p binary/isolinux
-
- case "${LIVE_CHROOT_BUILD}" in
- enabled)
- cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
- ;;
-
- disabled)
- cp /usr/lib/syslinux/isolinux.bin binary/isolinux
- ;;
- esac
-
- cp -r "${TEMPLATES}"/* binary/isolinux
- mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg
-
- # Copying local configuration file
- if [ -f config/binary_syslinux/syslinux.cfg ]
- then
- cp config/binary_syslinux/syslinux.cfg binary/isolinux/isolinux.cfg
- fi
-
- # Copying splash screen
- if [ -f config/binary_syslinux/splash.rle ]
- then
- LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
- fi
-
- if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
- then
- if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
- then
- rm -f binary/isolinux/splash.rle
- sed -e "s/.*splash.*//" binary/isolinux/boot.txt
- else
- cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
- fi
- fi
-
- # Configure syslinux templates
- sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
-
- # Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
- then
- NUMBER="0"
-
- # FIXME: This has a bug *iff* flavours = 686 686-bigmem (note the order).
-
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- 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/isolinux/isolinux.cfg
- done
- else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
- fi
-
- # Remove whitespaces
- sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg
- ;;
-
- net)
- # Copying syslinux
- mkdir -p tftpboot
-
- case "${LIVE_CHROOT_BUILD}" in
- enabled)
- cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
- ;;
-
- disabled)
- cp /usr/lib/syslinux/pxelinux.0 tftpboot
- ;;
- esac
-
- mkdir -p tftpboot/pxelinux.cfg
- cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg
- mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
-
- # Copying local configuration file
- if [ -f config/binary_syslinux/syslinux.cfg ]
- then
- cp config/binary_syslinux/syslinux.cfg tftpboot/pxelinux.cfg/default
- fi
-
- #sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
-
- # Copying splash screen
- if [ -f config/binary_syslinux/splash.rle ]
- then
- LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
- fi
-
- if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
- then
- if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
- then
- rm -f tftpboot/pxelinux.cfg/splash.rle
- sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
- else
- cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
- fi
- fi
-
- # Configure syslinux templates
- sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
-
- # Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
- then
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
- fi
-
- # Remove whitespaces
- sed -i -e 's/\ $//g' tftpboot/pxelinux.cfg/default
- ;;
-
- tar|usb-hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/syslinux"
- fi
-
- # Copying syslinux
- mkdir -p "${DESTDIR}"
-
- case "${LIVE_CHROOT_BUILD}" in
- enabled)
- cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
- ;;
-
- disabled)
- cp /usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
- ;;
- esac
-
- cp -r "${TEMPLATES}"/* "${DESTDIR}"
-
- # Copying local configuration file
- if [ -f config/binary_syslinux/syslinux.cfg ]
- then
- cp config/binary_syslinux/syslinux.cfg "${DESTDIR}"/syslinux.cfg
- fi
-
- # Copying splash screen
- if [ -f config/binary_syslinux/splash.rle ]
- then
- LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
- fi
-
- if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
- then
- if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
- then
- rm -f "${DESTDIR}"/splash.rle
- sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
- else
- cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
- fi
- fi
-
- # Configure syslinux templates
- sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at 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
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
- then
- NUMBER="0"
-
- 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
-
- # Remove whitespaces
- sed -i -e 's/\ $//g' "${DESTDIR}"/syslinux.cfg
- fi
- ;;
-esac
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux
Copied: releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux (from rev 2598, dists/trunk/live-helper/helpers/lh_binary_syslinux)
===================================================================
--- releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux (rev 0)
+++ releases/live-helper/1.0~a20-1/helpers/lh_binary_syslinux 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,618 @@
+#!/bin/sh
+
+# lh_binary_syslinux(1) - installs syslinux into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="installs syslinux into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin installing syslinux..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_syslinux
+
+# Checking syslinux templates
+Check_templates syslinux
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture amd64 i386
+
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Local functions
+Syslinux_live_entry ()
+{
+ LABEL="${1}"
+ KERNEL="${2}"
+ INITRD="${3}"
+ APPEND="${4}"
+
+ # syslinux << 3.36 lacks support to file/path
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_LIVE}`" != "binary" ]
+ then
+ DIRECTORY="`basename ${DESTDIR_LIVE}`"
+ KERNEL="${DIRECTORY}/${KERNEL}"
+ INITRD="${DIRECTORY}/${INITRD}"
+ fi
+
+ LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
+ LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
+ LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
+}
+
+Syslinux_install_entry ()
+{
+ LABEL="${1}"
+ KERNEL="${2}"
+ INITRD="${3}"
+ APPEND="${4}"
+
+ # syslinux << 3.36 lacks support to file/path
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_INSTALL}`" != "binary" ]
+ then
+ DIRECTORY="`basename ${DESTDIR_INSTALL}`"
+ KERNEL="${DIRECTORY}/${KERNEL}"
+ INITRD="${DIRECTORY}/${INITRD}"
+ fi
+
+ # Boot in quiet mode
+ if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ then
+ APPEND="${APPEND} quiet"
+ fi
+
+ LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tkernel /${KERNEL}\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=/${INITRD} ${APPEND} --\n"
+}
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ case "${LH_INITRAMFS}" in
+ casper)
+ DESTDIR_LIVE="binary/casper"
+ ;;
+
+ live-initramfs)
+ DESTDIR_LIVE="binary/live"
+ ;;
+ esac
+
+ DESTDIR_INSTALL="binary/install"
+ ;;
+
+ net)
+ DESTDIR_LIVE="tftpboot"
+ DESTDIR_INSTALL="tftpboot"
+ ;;
+
+ tar|usb-hdd)
+ case "${LH_INITRAMFS}" in
+ casper)
+ DESTDIR_LIVE="binary/casper"
+ ;;
+
+ live-initramfs)
+ DESTDIR_LIVE="binary/live"
+ ;;
+ esac
+
+ DESTDIR_INSTALL="binary/install"
+
+ # syslinux << 3.36 lacks support for long file/path
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ DESTDIR_LIVE="binary"
+ DESTDIR_INSTALL="binary"
+ fi
+ ;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR_LIVE}"
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+ 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
+ case "${LH_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
+fi
+
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
+if [ "${LIVE_BINARY_IMAGES}" = "net" ]
+then
+ case "${LIVE_NET_FILESYSTEM}" in
+ nfs)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH"
+ ;;
+
+ cifs)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=cifs nfsroot=//LIVE_NET_SERVERLIVE_NET_PATH"
+ ;;
+
+ *)
+ Echo_error "Unsupported net filesystem"
+ exit 1
+ ;;
+ esac
+
+ if [ -n "${LIVE_NET_MOUNTOPTIONS}" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} nfsopts=${LIVE_NET_MOUNTOPTIONS}"
+ fi
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+
+# Assembling kernel configuration
+
+# Default entries
+DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
+DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
+
+Syslinux_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+ for KERNEL in chroot/boot/vmlinuz-*
+ do
+ KERNEL_IMAGE="`basename ${KERNEL}`"
+ KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
+ INITRD="initrd.img-${KERNEL_VERSION}"
+
+ Syslinux_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
+ Syslinux_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
+ done
+fi
+
+LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+ APPEND_DI="vga=normal"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ then
+ VMLINUZ_DI="vmlinuz.di"
+ INITRD_DI="initrddi.gz"
+
+ VMLINUZ_GI="vmlinuz.gi"
+ INITRD_GI="initrdgi.gz"
+ fi
+ fi
+
+ Syslinux_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+ Syslinux_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+ Syslinux_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
+ Syslinux_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
+ Syslinux_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
+ Syslinux_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
+ Syslinux_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
+ Syslinux_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
+ Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
+fi
+
+LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+ KERNEL_PATH="/`basename ${DESTDIR_LIVE}`/"
+
+ # syslinux << 3.36 lacks support to file/path
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ KERNEL_PATH=""
+ fi
+
+ MEMTEST="LABEL memtest\n\tkernel ${KERNEL_PATH}memtest"
+ MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ # Copying syslinux
+ mkdir -p binary/isolinux
+
+ case "${LIVE_CHROOT_BUILD}" in
+ enabled)
+ cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+ ;;
+
+ disabled)
+ cp /usr/lib/syslinux/isolinux.bin binary/isolinux
+ ;;
+ esac
+
+ cp -r "${TEMPLATES}"/* binary/isolinux
+
+ for FILE in binary/isolinux/*.live
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
+ done
+
+ if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+ then
+ for FILE in binary/isolinux/*.install
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
+ done
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ for FILE in binary/isolinux/*.install.g-i
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i`
+ done
+ else
+ rm -f binary/isolinux/*.install.g-i
+ fi
+ else
+ rm -f binary/isolinux/*.install*
+ fi
+
+ mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg
+
+ # Copying local configuration file
+ if [ -f config/binary_syslinux/syslinux.cfg ]
+ then
+ cp config/binary_syslinux/syslinux.cfg binary/isolinux/isolinux.cfg
+ fi
+
+ # Copying splash screen
+ if [ -f config/binary_syslinux/splash.rle ]
+ then
+ LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+ fi
+
+ if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+ then
+ if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+ then
+ rm -f binary/isolinux/splash.rle
+ sed -e "s/.*splash.*//" binary/isolinux/boot.txt
+ else
+ cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+ fi
+ fi
+
+ # Configure syslinux templates
+ sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
+ sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/CD-ROM/" binary/isolinux/f1.txt
+ sed -i -e "s/LIVE_MEDIA/CD-ROM/" binary/isolinux/f3.txt
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
+
+ # Working arround syslinux 8.3 limitation
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ NUMBER="0"
+
+ # FIXME: This has a bug *iff* flavours = 686 686-bigmem (note the order).
+
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ 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/isolinux/isolinux.cfg
+ done
+ else
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+ fi
+
+ # Remove whitespaces
+ sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg
+ ;;
+
+ net)
+ # Copying syslinux
+ mkdir -p tftpboot
+
+ case "${LIVE_CHROOT_BUILD}" in
+ enabled)
+ cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+ ;;
+
+ disabled)
+ cp /usr/lib/syslinux/pxelinux.0 tftpboot
+ ;;
+ esac
+
+ mkdir -p tftpboot/pxelinux.cfg
+ cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg
+
+ for FILE in tftpboot/pxelinux.cfg/*.live
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
+ done
+
+ if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+ then
+ for FILE in tftpboot/pxelinux.cfg/*.install
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
+ done
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ for FILE in tftpboot/pxelinux.cfg/*.install.g-i
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i`
+ done
+ else
+ rm -f tftpboot/pxelinux.cfg/*.install.g-i
+ fi
+ else
+ rm -f tftpboot/pxelinux.cfg/*.install*
+ fi
+
+ mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
+
+ # Copying local configuration file
+ if [ -f config/binary_syslinux/syslinux.cfg ]
+ then
+ cp config/binary_syslinux/syslinux.cfg tftpboot/pxelinux.cfg/default
+ fi
+
+ #sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
+
+ # Copying splash screen
+ if [ -f config/binary_syslinux/splash.rle ]
+ then
+ LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+ fi
+
+ if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+ then
+ if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+ then
+ rm -f tftpboot/pxelinux.cfg/splash.rle
+ sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
+ else
+ cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+ fi
+ fi
+
+ # Configure syslinux templates
+ sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default
+ sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt
+ sed -i -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
+
+ # Working arround syslinux 8.3 limitation
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
+ then
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
+ fi
+
+ # Remove whitespaces
+ sed -i -e 's/\ $//g' tftpboot/pxelinux.cfg/default
+ ;;
+
+ tar|usb-hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/syslinux"
+ fi
+
+ # Copying syslinux
+ mkdir -p "${DESTDIR}"
+
+ case "${LIVE_CHROOT_BUILD}" in
+ enabled)
+ cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+ ;;
+
+ disabled)
+ cp /usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+ ;;
+ esac
+
+ cp -r "${TEMPLATES}"/* "${DESTDIR}"
+
+ for FILE in "${DESTDIR}"/*.live
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
+ done
+
+ if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+ then
+ for FILE in "${DESTDIR}"/*.install
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
+ done
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ for FILE in "${DESTDIR}"/*.install.g-i
+ do
+ mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i`
+ done
+ else
+ rm -f "${DESTDIR}"/*.install.g-i
+ fi
+ else
+ rm -f "${DESTDIR}"/*.install*
+ fi
+
+ # Copying local configuration file
+ if [ -f config/binary_syslinux/syslinux.cfg ]
+ then
+ cp config/binary_syslinux/syslinux.cfg "${DESTDIR}"/syslinux.cfg
+ fi
+
+ # Copying splash screen
+ if [ -f config/binary_syslinux/splash.rle ]
+ then
+ LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+ fi
+
+ if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+ then
+ if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+ then
+ rm -f "${DESTDIR}"/splash.rle
+ sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
+ else
+ cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
+ fi
+ fi
+
+ # Configure syslinux templates
+ sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME
+ sed -i -e "s/LIVE_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ NUMBER="0"
+
+ 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
+
+ # Remove whitespaces
+ sed -i -e 's/\ $//g' "${DESTDIR}"/syslinux.cfg
+ fi
+ ;;
+esac
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux
Deleted: releases/live-helper/1.0~a20-1/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/helpers/lh_chroot 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# lh_chroot(1) - customize the Debian system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="customize the Debian system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-# Configuring chroot
-lh_chroot_cache restore ${*}
-lh_chroot_proc install ${*}
-lh_chroot_sysfs install ${*}
-lh_chroot_debianchroot install ${*}
-lh_chroot_sysv-rc install ${*}
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_hostname install ${*}
-lh_chroot_apt install ${*}
-lh_chroot_sources install ${*}
-lh_chroot_linux-image install ${*}
-
-# Customizing chroot
-lh_chroot_preseed ${*}
-lh_chroot_tasks ${*}
-lh_chroot_packageslists ${*}
-lh_chroot_packages ${*}
-lh_chroot_local-packageslists ${*}
-lh_chroot_local-packages ${*}
-lh_chroot_localization ${*}
-lh_chroot_local-includes ${*}
-lh_chroot_sysvinit ${*}
-lh_chroot_hooks ${*}
-lh_chroot_local-hooks ${*}
-lh_chroot_symlinks ${*}
-lh_chroot_hacks ${*}
-lh_chroot_interactive ${*}
-
-# Deconfiguring chroot
-lh_chroot_linux-image remove ${*}
-lh_chroot_sources remove ${*}
-lh_chroot_apt remove ${*}
-lh_chroot_hostname remove ${*}
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
-lh_chroot_sysv-rc remove ${*}
-lh_chroot_debianchroot remove ${*}
-lh_chroot_sysfs remove ${*}
-lh_chroot_proc remove ${*}
-lh_chroot_cache save ${*}
Copied: releases/live-helper/1.0~a20-1/helpers/lh_chroot (from rev 2598, dists/trunk/live-helper/helpers/lh_chroot)
===================================================================
--- releases/live-helper/1.0~a20-1/helpers/lh_chroot (rev 0)
+++ releases/live-helper/1.0~a20-1/helpers/lh_chroot 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# lh_chroot(1) - customize the Debian system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="customize the Debian system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+# Configuring chroot
+lh_chroot_cache restore ${*}
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_debianchroot install ${*}
+lh_chroot_sysv-rc install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_hostname install ${*}
+lh_chroot_apt install ${*}
+lh_chroot_sources install ${*}
+lh_chroot_linux-image install ${*}
+
+# Customizing chroot
+lh_chroot_preseed ${*}
+lh_chroot_local-preseed ${*}
+lh_chroot_tasks ${*}
+lh_chroot_packageslists ${*}
+lh_chroot_packages ${*}
+lh_chroot_local-packageslists ${*}
+lh_chroot_local-packages ${*}
+lh_chroot_localization ${*}
+lh_chroot_local-includes ${*}
+lh_chroot_sysvinit ${*}
+lh_chroot_hooks ${*}
+lh_chroot_local-hooks ${*}
+lh_chroot_symlinks ${*}
+lh_chroot_hacks ${*}
+lh_chroot_interactive ${*}
+
+# Deconfiguring chroot
+lh_chroot_linux-image remove ${*}
+lh_chroot_sources remove ${*}
+lh_chroot_apt remove ${*}
+lh_chroot_hostname remove ${*}
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysv-rc remove ${*}
+lh_chroot_debianchroot remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
+lh_chroot_cache save ${*}
Copied: releases/live-helper/1.0~a20-1/helpers/lh_chroot_local-preseed (from rev 2598, dists/trunk/live-helper/helpers/lh_chroot_local-preseed)
===================================================================
--- releases/live-helper/1.0~a20-1/helpers/lh_chroot_local-preseed (rev 0)
+++ releases/live-helper/1.0~a20-1/helpers/lh_chroot_local-preseed 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# lh_chroot_local-preseed(1) - use debconf local preseeding file
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute local preseed in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing locale preseed..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-preseed/* > /dev/null 2>&1
+then
+ # Check dependency
+ Check_package chroot/usr/bin/debconf-set-selections debconf
+
+ # Install dependency
+ Install_package
+
+ for PRESEED in config/chroot_local-preseed/*
+ do
+ # Copying local preseed
+ cp "${PRESEED}" chroot/root/preseed
+
+ Chroot "debconf-set-selections /root/preseed"
+
+ # Removing local preseed file
+ rm -f chroot/root/preseed
+ done
+
+ # Remove dependency
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-preseed
+fi
Deleted: releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_preseed(1) - mount /proc
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="execute preseed in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ -z "${LIVE_PRESEED}" ]
-then
- exit 0
-fi
-
-Echo_message "Begin executing preseed..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_preseed
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -f "${LIVE_PRESEED}" ]
-then
- # Check dependency
- Check_package chroot/usr/bin/debconf-set-selections debconf
-
- # Install dependency
- Install_package
-
- # Copying preseed
- cp "${LIVE_PRESEED}" chroot/root/preseed
-
- Chroot "debconf-set-selections /root/preseed"
-
- # Removing preseed file
- rm -f chroot/root/preseed
-
- # Remove dependency
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/chroot_preseed
-else
- Echo_error "'${LIVE_PRESEED}' file doesn't exists."
- exit 1
-fi
Copied: releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed (from rev 2598, dists/trunk/live-helper/helpers/lh_chroot_preseed)
===================================================================
--- releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed (rev 0)
+++ releases/live-helper/1.0~a20-1/helpers/lh_chroot_preseed 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# lh_chroot_preseed(1) - use debconf preseeding file
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute preseed in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing preseed..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing preseeds
+for PRESEED in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+do
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/preseed/"${PRESEED}" ]
+ then
+ # Check dependency
+ Check_package chroot/usr/bin/debconf-set-selections debconf
+
+ # Install dependency
+ Install_package
+
+ # Copying preseed
+ cp "${PRESEED}" chroot/root/preseed
+
+ Chroot "debconf-set-selections /root/preseed"
+
+ # Removing preseed file
+ rm -f chroot/root/preseed
+
+ # Remove dependency
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_preseed
+ fi
+done
Deleted: releases/live-helper/1.0~a20-1/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/helpers/lh_config 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,415 +0,0 @@
-#!/bin/sh
-
-# lh_config(1) - create configuration for live-helper(7)
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="create configuration for live-helper(7)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-CONFIG="${1}"
-
-if [ -n "${LH_CONFIG}" ]
-then
- if [ -d ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
- then
- mkdir "${LH_CONFIG}"
- cp -r ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
-
- LIVE_ROOT="${LH_CONFIG}"
- CONFIG=""
- else
- Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE:-/usr/share/live-helper}/configs/."
- fi
-fi
-
-if [ "${CONFIG}" != "newconfig" ]
-then
- # Source existing configuration
- Read_conffile "${LIVE_ROOT}"/config/common
- Read_conffile "${LIVE_ROOT}"/config/bootstrap
- Read_conffile "${LIVE_ROOT}"/config/chroot
- Read_conffile "${LIVE_ROOT}"/config/binary
- Read_conffile "${LIVE_ROOT}"/config/source
-fi
-
-# Setting defaults
-Set_defaults
-
-# Creating bootstrap configuration
-mkdir -p "${LIVE_ROOT}"/config
-mkdir -p "${LIVE_ROOT}"/config/includes
-mkdir -p "${LIVE_ROOT}"/config/templates
-
-# Creating live-helper configuration
-cat > "${LIVE_ROOT}"/config/common << EOF
-# config/common - common options for live-helper(7)
-
-# \$LH_APT: set package manager
-# (Default: ${LH_APT})
-LH_APT="${LH_APT}"
-
-# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
-
-# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
-
-# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: ${LH_APT_PDIFFS})
-LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-
-# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: ${LH_APT_PIPELINE})
-LH_APT_PIPELINE="${LH_APT_PIPELINE}"
-
-# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: ${LH_APT_RECOMMENDS})
-LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-
-# \$LH_APT_SECURE: set apt/aptitude security
-# (Default: ${LH_APT_SECURE})
-LH_APT_SECURE="${LH_APT_SECURE}"
-
-# \$LH_BOOTSTRAP: set bootstrap program
-# (Default: ${LH_BOOTSTRAP})
-LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-
-# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: ${LH_CACHE_INDICES})
-LH_CACHE_INDICES="${LH_CACHE_INDICES}"
-
-# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: ${LH_CACHE_PACKAGES})
-LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
-
-# \$LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: ${LH_CACHE_STAGES})
-LH_CACHE_STAGES="${LH_CACHE_STAGES}"
-
-# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: ${LH_DEBCONF_FRONTEND})
-LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-
-# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: ${LH_DEBCONF_NOWARNINGS})
-LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-
-# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
-# \$LH_GENISOIMAGE: set genisoimage program
-# (Default: ${LH_GENISOIMAGE})
-LH_GENISOIMAGE="${LH_GENISOIMAGE}"
-
-# \$LH_INITRAMFS: set initramfs hook
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
-
-# \$LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="${LH_LOSETUP}"
-
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
-
-# \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# \$LH_TASKSEL: set tasksel program
-# (Default: ${LH_TASKSEL})
-LH_TASKSEL="${LH_TASKSEL}"
-
-# \$LIVE_ROOT: set root directory
-# (Default: ${LIVE_ROOT})
-LIVE_ROOT="${LIVE_ROOT}"
-
-# \$LIVE_INCLUDES: set includes
-# (Default: ${LIVE_INCLUDES})
-LIVE_INCLUDES="${LIVE_INCLUDES}"
-
-# \$LIVE_TEMPLATES: set templates
-# (Default: ${LIVE_TEMPLATES})
-LIVE_TEMPLATES="${LIVE_TEMPLATES}"
-
-# Live-helper options
-
-# \$LH_BREAKPOINTS: enable breakpoints
-# (Default: ${LH_BREAKPOINTS})
-#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
-
-# \$LH_DEBUG: enable debug
-# (Default: ${LH_DEBUG})
-#LH_DEBUG="${LH_DEBUG}"
-
-# \$LH_FORCE: enable force
-# (Default: ${LH_FORCE})
-#LH_FORCE="${LH_FORCE}"
-
-# \$LH_QUIET: enable quiet
-# (Default: ${LH_QUIET})
-#LH_QUIET="${LH_QUIET}"
-
-# \$LH_VERBOSE: enable verbose
-# (Default: ${LH_VERBOSE})
-#LH_VERBOSE="${LH_VERBOSE}"
-EOF
-
-# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# \$LIVE_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
-
-# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
-# (Default: empty)
-LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
-
-# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-
-# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
-
-# \$LIVE_DISTRIBUTION: select distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP})
-LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
-
-# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
-LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
-
-# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY})
-LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
-
-# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
-LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
-
-# \$LIVE_SECTIONS: select section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
-EOF
-
-# Creating lh_chroot_* configuration
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
-
-cat > "${LIVE_ROOT}"/config/chroot << EOF
-# config/chroot - options for live-helper(7), chroot stage
-
-# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: ${LIVE_CHROOT_FILESYSTEM})
-LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
-
-# \$LIVE_UNION_FILESYSTEM: set union filesystem
-# (Default: ${LIVE_UNION_FILESYSTEM}
-LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM}"
-
-# \$LIVE_HOOKS: set hook commands
-# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
-
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
-
-# \$LIVE_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
-
-# \$LIVE_LANGUAGE: set language to use
-# (Default: empty)
-LIVE_LANGUAGE="${LIVE_LANGUAGE}"
-
-# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
-
-# \$LIVE_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
-
-# \$LIVE_PACKAGES: set packages to install
-# (Default: empty)
-LIVE_PACKAGES="${LIVE_PACKAGES}"
-
-# \$LIVE_PACKAGES_LISTS: set package list to install
-# (Default: ${LIVE_PACKAGES_LISTS})
-LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
-
-# \$LIVE_PRESEED: set package preseed
-# (Default: ${LIVE_PRESEED})
-LIVE_PRESEED="${LIVE_PRESEED}"
-
-# \$LIVE_TASKS: set tasks to install
-# (Default: empty)
-LIVE_TASKS="${LIVE_TASKS}"
-
-# \$LIVE_SECURITY: enable security updates
-# (Default: ${LIVE_SECURITY})
-LIVE_SECURITY="${LIVE_SECURITY}"
-
-# \$LIVE_SYMLINKS: enable symlink convertion
-# (Default: ${LIVE_SYMLINKS})
-LIVE_SYMLINKS="${LIVE_SYMLINKS}"
-
-# \$LIVE_SYSVINIT: enable sysvinit
-# (Default: ${LIVE_SYSVINIT})
-LIVE_SYSVINIT="${LIVE_SYSVINIT}"
-EOF
-
-# Creating lh_binary_* configuration
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_local-debs
-mkdir -p "${LIVE_ROOT}"/config/binary_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
-mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs
-mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
-
-cat > "${LIVE_ROOT}"/config/binary << EOF
-# config/binary - options for live-helper(7), binary stage
-
-# \$LIVE_BINARY_IMAGES: set image type
-# (Default: ${LIVE_BINARY_IMAGES})
-LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
-
-# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LIVE_BINARY_INDICES})
-LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
-
-# \$LIVE_BOOTAPPEND: set boot parameters
-# (Default: empty)
-LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
-
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
-
-# \${LIVE_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: ${LIVE_CHROOT_BUILD})
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD}"
-
-# \$LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LIVE_DEBIAN_INSTALLER})
-LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
-
-# \$LIVE_ENCRYPTION: set encrytion
-# (Default: empty)
-LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
-
-# \$LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
-
-# \$LIVE_HOSTNAME: set hostname
-# (Default: ${LIVE_HOSTNAME})
-LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-
-# \$LIVE_ISO_APPLICATION: set iso author
-# (Default: ${LIVE_ISO_APPLICATION})
-LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
-
-# \$LIVE_ISO_PREPARER: set iso preparer
-# (Default: ${LIVE_ISO_PREPARER})
-LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
-
-# \$LIVE_ISO_PUBLISHER: set iso preparer
-# (Default: ${LIVE_ISO_PUBLISHER})
-LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
-
-# \$LIVE_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: ${LIVE_ISO_VOLUME})
-LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
-
-# \$LIVE_NET_FILESYSTEM: set netboot filesystem
-# (Default: ${LIVE_NET_FILESYSTEM})
-LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM}"
-
-# \$LIVE_NET_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-LIVE_NET_MOUNTOPTIONS="${LIVE_NET_MOUNTOPTIONS}"
-
-# \$LIVE_NET_PATH: set netboot server directory
-# (Default: ${LIVE_NET_PATH})
-LIVE_NET_PATH="${LIVE_NET_PATH}"
-
-# \$LIVE_NET_SERVER: set netboot server address
-# (Default: ${LIVE_NET_SERVER})
-LIVE_NET_SERVER="${LIVE_NET_SERVER}"
-
-# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
-EOF
-
-# Creating lh_source_* configuration
-cat > "${LIVE_ROOT}"/config/source << EOF
-# config/source - options for live-helper(7), source stage
-
-# \$LIVE_SOURCE: set source option
-# (Default: ${LIVE_SOURCE})
-LIVE_SOURCE="${LIVE_SOURCE}"
-
-# \$LIVE_SOURCE_IMAGES: set image type
-# (Default: ${LIVE_SOURCE_IMAGES})
-LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
-EOF
-
-if [ "${CONFIG}" = "clone" ]
-then
- # Read package selection
- echo `dpkg --get-selections | awk '{ print $1 }'` > config/chroot_local-packageslists/local-system
-
- # Read debconf questions
- if [ ! -f /usr/bin/debconf-get-selections ]
- then
- Echo_warning "Please install 'debconf-utils' in order to use this feature."
- else
- debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
- fi
-fi
Copied: releases/live-helper/1.0~a20-1/helpers/lh_config (from rev 2598, dists/trunk/live-helper/helpers/lh_config)
===================================================================
--- releases/live-helper/1.0~a20-1/helpers/lh_config (rev 0)
+++ releases/live-helper/1.0~a20-1/helpers/lh_config 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,411 @@
+#!/bin/sh
+
+# lh_config(1) - create configuration for live-helper(7)
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create configuration for live-helper(7)"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+CONFIG="${1}"
+
+if [ -n "${LH_CONFIG}" ]
+then
+ if [ -d ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
+ then
+ mkdir "${LH_CONFIG}"
+ cp -r ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
+
+ LIVE_ROOT="${LH_CONFIG}"
+ CONFIG=""
+ else
+ Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE:-/usr/share/live-helper}/configs/."
+ fi
+fi
+
+if [ "${CONFIG}" != "newconfig" ]
+then
+ # Source existing configuration
+ Read_conffile "${LIVE_ROOT}"/config/common
+ Read_conffile "${LIVE_ROOT}"/config/bootstrap
+ Read_conffile "${LIVE_ROOT}"/config/chroot
+ Read_conffile "${LIVE_ROOT}"/config/binary
+ Read_conffile "${LIVE_ROOT}"/config/source
+fi
+
+# Setting defaults
+Set_defaults
+
+# Creating bootstrap configuration
+mkdir -p "${LIVE_ROOT}"/config
+mkdir -p "${LIVE_ROOT}"/config/includes
+mkdir -p "${LIVE_ROOT}"/config/templates
+
+# Creating live-helper configuration
+cat > "${LIVE_ROOT}"/config/common << EOF
+# config/common - common options for live-helper(7)
+
+# \$LH_APT: set package manager
+# (Default: ${LH_APT})
+LH_APT="${LH_APT}"
+
+# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
+# (Default: autodetected or empty)
+LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
+
+# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
+# (Default: autodetected or empty)
+LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
+
+# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
+# (Default: ${LH_APT_PDIFFS})
+LH_APT_PDIFFS="${LH_APT_PDIFFS}"
+
+# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LH_APT_PIPELINE})
+LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+
+# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
+# (Default: ${LH_APT_RECOMMENDS})
+LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
+
+# \$LH_APT_SECURE: set apt/aptitude security
+# (Default: ${LH_APT_SECURE})
+LH_APT_SECURE="${LH_APT_SECURE}"
+
+# \$LH_BOOTSTRAP: set bootstrap program
+# (Default: ${LH_BOOTSTRAP})
+LH_BOOTSTRAP="${LH_BOOTSTRAP}"
+
+# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: ${LH_CACHE_INDICES})
+LH_CACHE_INDICES="${LH_CACHE_INDICES}"
+
+# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: ${LH_CACHE_PACKAGES})
+LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
+
+# \$LH_CACHE_STAGES: control if completed stages should be cached
+# (Default: ${LH_CACHE_STAGES})
+LH_CACHE_STAGES="${LH_CACHE_STAGES}"
+
+# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# (Default: ${LH_DEBCONF_FRONTEND})
+LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
+
+# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: ${LH_DEBCONF_NOWARNINGS})
+LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
+
+# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LH_DEBCONF_PRIORITY})
+LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+
+# \$LH_GENISOIMAGE: set genisoimage program
+# (Default: ${LH_GENISOIMAGE})
+LH_GENISOIMAGE="${LH_GENISOIMAGE}"
+
+# \$LH_INITRAMFS: set initramfs hook
+# (Default: ${LH_INITRAMFS})
+LH_INITRAMFS="${LH_INITRAMFS}"
+
+# \$LH_LOSETUP: set losetup program
+# (Default: autodetected)
+LH_LOSETUP="${LH_LOSETUP}"
+
+# \$LH_MODE: set distribution mode
+# (Default: ${LH_MODE})
+LH_MODE="${LH_MODE}"
+
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# \$LH_TASKSEL: set tasksel program
+# (Default: ${LH_TASKSEL})
+LH_TASKSEL="${LH_TASKSEL}"
+
+# \$LIVE_ROOT: set root directory
+# (Default: ${LIVE_ROOT})
+LIVE_ROOT="${LIVE_ROOT}"
+
+# \$LIVE_INCLUDES: set includes
+# (Default: ${LIVE_INCLUDES})
+LIVE_INCLUDES="${LIVE_INCLUDES}"
+
+# \$LIVE_TEMPLATES: set templates
+# (Default: ${LIVE_TEMPLATES})
+LIVE_TEMPLATES="${LIVE_TEMPLATES}"
+
+# Live-helper options
+
+# \$LH_BREAKPOINTS: enable breakpoints
+# (Default: ${LH_BREAKPOINTS})
+#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
+
+# \$LH_DEBUG: enable debug
+# (Default: ${LH_DEBUG})
+#LH_DEBUG="${LH_DEBUG}"
+
+# \$LH_FORCE: enable force
+# (Default: ${LH_FORCE})
+#LH_FORCE="${LH_FORCE}"
+
+# \$LH_QUIET: enable quiet
+# (Default: ${LH_QUIET})
+#LH_QUIET="${LH_QUIET}"
+
+# \$LH_VERBOSE: enable verbose
+# (Default: ${LH_VERBOSE})
+#LH_VERBOSE="${LH_VERBOSE}"
+EOF
+
+# Creating lh_bootstrap_* configuration
+cat > "${LIVE_ROOT}"/config/bootstrap << EOF
+# config/bootstrap - options for live-helper(7), bootstrap stage
+
+# \$LIVE_ARCHITECTURE: select chroot architecture
+# (Default: autodetected)
+LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
+
+# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# (Default: empty)
+LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
+
+# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
+LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+
+# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+
+# \$LIVE_DISTRIBUTION: select distribution to use
+# (Default: ${LIVE_DISTRIBUTION})
+LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
+
+# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
+
+# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
+LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
+
+# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
+
+# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
+LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
+
+# \$LIVE_SECTIONS: select section(s) to use
+# (Default: ${LIVE_SECTIONS})
+LIVE_SECTIONS="${LIVE_SECTIONS}"
+EOF
+
+# Creating lh_chroot_* configuration
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+
+cat > "${LIVE_ROOT}"/config/chroot << EOF
+# config/chroot - options for live-helper(7), chroot stage
+
+# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LIVE_CHROOT_FILESYSTEM})
+LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+
+# \$LIVE_UNION_FILESYSTEM: set union filesystem
+# (Default: ${LIVE_UNION_FILESYSTEM}
+LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM}"
+
+# \$LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS="${LIVE_HOOKS}"
+
+# \$LIVE_INTERACTIVE: set interactive build
+# (Default: ${LIVE_INTERACTIVE})
+LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
+
+# \$LIVE_KEYRING_PACKAGES: set keyring packages
+# (Default: empty)
+LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
+
+# \$LIVE_LANGUAGE: set language to use
+# (Default: empty)
+LIVE_LANGUAGE="${LIVE_LANGUAGE}"
+
+# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
+
+# \$LIVE_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
+
+# \$LIVE_PACKAGES: set packages to install
+# (Default: empty)
+LIVE_PACKAGES="${LIVE_PACKAGES}"
+
+# \$LIVE_PACKAGES_LISTS: set package list to install
+# (Default: ${LIVE_PACKAGES_LISTS})
+LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
+
+# \$LIVE_TASKS: set tasks to install
+# (Default: empty)
+LIVE_TASKS="${LIVE_TASKS}"
+
+# \$LIVE_SECURITY: enable security updates
+# (Default: ${LIVE_SECURITY})
+LIVE_SECURITY="${LIVE_SECURITY}"
+
+# \$LIVE_SYMLINKS: enable symlink convertion
+# (Default: ${LIVE_SYMLINKS})
+LIVE_SYMLINKS="${LIVE_SYMLINKS}"
+
+# \$LIVE_SYSVINIT: enable sysvinit
+# (Default: ${LIVE_SYSVINIT})
+LIVE_SYSVINIT="${LIVE_SYSVINIT}"
+EOF
+
+# Creating lh_binary_* configuration
+mkdir -p "${LIVE_ROOT}"/config/binary_grub
+mkdir -p "${LIVE_ROOT}"/config/binary_local-debs
+mkdir -p "${LIVE_ROOT}"/config/binary_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs
+mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
+mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
+
+cat > "${LIVE_ROOT}"/config/binary << EOF
+# config/binary - options for live-helper(7), binary stage
+
+# \$LIVE_BINARY_IMAGES: set image type
+# (Default: ${LIVE_BINARY_IMAGES})
+LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
+
+# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LIVE_BINARY_INDICES})
+LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
+
+# \$LIVE_BOOTAPPEND: set boot parameters
+# (Default: empty)
+LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
+
+# \$LIVE_BOOTLOADER: set bootloader
+# (Default: ${LIVE_BOOTLOADER})
+LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+
+# \${LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# (Default: ${LIVE_CHROOT_BUILD})
+# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
+LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD}"
+
+# \$LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LIVE_DEBIAN_INSTALLER})
+LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+
+# \$LIVE_ENCRYPTION: set encrytion
+# (Default: empty)
+LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
+
+# \$LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
+
+# \$LIVE_HOSTNAME: set hostname
+# (Default: ${LIVE_HOSTNAME})
+LIVE_HOSTNAME="${LIVE_HOSTNAME}"
+
+# \$LIVE_ISO_APPLICATION: set iso author
+# (Default: ${LIVE_ISO_APPLICATION})
+LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
+
+# \$LIVE_ISO_PREPARER: set iso preparer
+# (Default: ${LIVE_ISO_PREPARER})
+LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
+
+# \$LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: ${LIVE_ISO_PUBLISHER})
+LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
+
+# \$LIVE_ISO_VOLUME: set iso volume (max 32 chars)
+# (Default: ${LIVE_ISO_VOLUME})
+LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
+
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
+
+# \$LIVE_NET_FILESYSTEM: set netboot filesystem
+# (Default: ${LIVE_NET_FILESYSTEM})
+LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM}"
+
+# \$LIVE_NET_MOUNTOPTIONS: set nfsopts
+# (Default: empty)
+LIVE_NET_MOUNTOPTIONS="${LIVE_NET_MOUNTOPTIONS}"
+
+# \$LIVE_NET_PATH: set netboot server directory
+# (Default: ${LIVE_NET_PATH})
+LIVE_NET_PATH="${LIVE_NET_PATH}"
+
+# \$LIVE_NET_SERVER: set netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
+
+# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# (Default: empty)
+LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
+
+# \$LIVE_USERNAME: set username
+# (Default: ${LIVE_USERNAME})
+LIVE_USERNAME="${LIVE_USERNAME}"
+EOF
+
+# Creating lh_source_* configuration
+cat > "${LIVE_ROOT}"/config/source << EOF
+# config/source - options for live-helper(7), source stage
+
+# \$LIVE_SOURCE: set source option
+# (Default: ${LIVE_SOURCE})
+LIVE_SOURCE="${LIVE_SOURCE}"
+
+# \$LIVE_SOURCE_IMAGES: set image type
+# (Default: ${LIVE_SOURCE_IMAGES})
+LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
+EOF
+
+if [ "${CONFIG}" = "clone" ]
+then
+ # Read package selection
+ echo `dpkg --get-selections | awk '{ print $1 }'` > config/chroot_local-packageslists/local-system
+
+ # Read debconf questions
+ if [ ! -f /usr/bin/debconf-get-selections ]
+ then
+ Echo_warning "Please install 'debconf-utils' in order to use this feature."
+ else
+ debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
+ fi
+fi
Copied: releases/live-helper/1.0~a20-1/templates/casper (from rev 2598, dists/trunk/live-helper/templates/casper)
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/boot.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,3 +0,0 @@
-splash.rle
-
-Press F1control and F then 1 for help, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt (from rev 2598, dists/trunk/live-helper/templates/syslinux/boot.txt)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/boot.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,3 @@
+splash.rle
+
+Press F1control and F then 1 for help, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f1.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,25 +0,0 @@
- 0fWelcome to Debian GNU/Linux!07 09F107
-
-This is a Debian Live CD-ROM.
-It was built on LIVE_DATE.
-
-0fHELP INDEX07
-
-0fKEY TOPIC07
-
-<09F107> This page, the help index.
-<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this CD-ROM
-<09F407> Additional boot methods; live and rescue modes.
-<09F507> Special boot parameters, overview.
-<09F607> Special boot parameters for special machines.
-<09F707> Special boot parameters for selected disk controllers.
-<09F807> Special boot parameters for the install system.
-<09F907> How to get help.
-<09F1007> Copyrights and warranties.
-
-For F1-F9 type control and F then the digit 1-9
-For F10 type control and F then the digit 0
-
-
-Press F2 through F10 for details, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.install (from rev 2598, dists/trunk/live-helper/templates/syslinux/f1.txt.install)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.install (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.install 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,25 @@
+ 0fWelcome to Debian GNU/Linux!07 09F107
+
+This is a Debian LIVE_DISTRIBUTION combined live and installation LIVE_MEDIA.
+It was built on LIVE_DATE.
+
+0fHELP INDEX07
+
+0fKEY TOPIC07
+
+<09F107> This page, the help index.
+<09F207> Prerequisites for installing Debian.
+<09F307> Boot methods for special ways of using this LIVE_MEDIA
+<09F407> Additional boot methods; rescue mode.
+<09F507> Special boot parameters, overview.
+<09F607> Special boot parameters for special machines.
+<09F707> Special boot parameters for selected disk controllers.
+<09F807> Special boot parameters for the install system.
+<09F907> How to get help.
+<09F1007> Copyrights and warranties.
+
+For F1-F9 type control and F then the digit 1-9
+For F10 type control and F then the digit 0
+
+
+Press F2 through F10 for details, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.live (from rev 2598, dists/trunk/live-helper/templates/syslinux/f1.txt.live)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.live (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f1.txt.live 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,25 @@
+ 0fWelcome to Debian GNU/Linux!07 09F107
+
+This is a Debian LIVE_DISTRIBUTION live LIVE_MEDIA.
+It was built on LIVE_DATE.
+
+0fHELP INDEX07
+
+0fKEY TOPIC07
+
+<09F107> This page, the help index.
+<09F207> Prerequisites for installing Debian.
+<09F307> Boot methods for special ways of using this LIVE_MEDIA
+<09F407> Additional boot methods.
+<09F507> Special boot parameters, overview.
+<09F607> Special boot parameters for special machines.
+<09F707> Special boot parameters for selected disk controllers.
+<09F807> Special boot parameters for the install system.
+<09F907> How to get help.
+<09F1007> Copyrights and warranties.
+
+For F1-F9 type control and F then the digit 1-9
+For F10 type control and F then the digit 0
+
+
+Press F2 through F10 for details, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f2.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207
-
-You must have at least 32 megabytes of RAM to use this Debian installer.
-
-You should have space on your hard disk to create a new disk partition
-of at least 256 megabytes to install the base system. You'll need more
-disk space to install additional packages, depending on what you wish
-to do with your new Debian system.
-
-See the Installation Manual or the FAQ for more information; both
-documents are available at the Debian web site, 0fhttp://www.debian.org/07
-
-Thank you for choosing Debian!
-
-
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.install (from rev 2598, dists/trunk/live-helper/templates/syslinux/f2.txt.install)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.install (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.install 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fPREREQUISITES FOR USING DEBIAN07 09F207
+
+You must have at least 64 megabytes of RAM to run this Debian Live system.
+
+See the Live Manual or the FAQ for more information; both
+documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+
+
+You must have at least 32 megabytes of RAM to use the Debian installer.
+
+You should have space on your hard disk to create a new disk partition
+of at least 256 megabytes to install the base system. You'll need more
+disk space to install additional packages, depending on what you wish
+to do with your new Debian system.
+
+See the Installation Manual or the FAQ for more information; both
+documents are available at the Debian web site, 0fhttp://www.debian.org/07
+
+Thank you for choosing Debian!
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.live (from rev 2598, dists/trunk/live-helper/templates/syslinux/f2.txt.live)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.live (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f2.txt.live 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fPREREQUISITES FOR RUNNING DEBIAN07 09F207
+
+You must have at least 64 megabytes of RAM to run this Debian Live system.
+
+See the Live Manual or the FAQ for more information; both
+documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+
+Thank you for choosing Debian!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f3.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fBOOT METHODS07 09F307
-
-
-0fAvailable boot methods:07
-
-0finstall07
- Start the installation.
-0finstallgui07
- Start the installation using the graphical installer.
-0fexpert07
- Start the installation in expert mode, for maximum control.
-0fexpertgui07
- Start the installation in expert mode using the graphical installer.
-
-To use one of these boot methods, type it at the prompt, optionally
-followed by any boot parameters. For example:
-
- boot: install acpi=off
-
-If unsure, you should use the default boot method, with no special
-parameters, by simply pressing enter at the boot prompt.
-
-Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install (from rev 2598, dists/trunk/live-helper/templates/syslinux/f3.txt.install)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fBOOT METHODS07 09F307
+
+0fAvailable boot methods:07
+
+0flive07
+ Start the live system -- this is the default LIVE_MEDIA method.
+0flive-failsafe07
+ Start the live system in fail-safe mode.
+0finstall07
+ Start the installation.
+0fexpert07
+ Start the installation in expert mode, for maximum control.
+
+To use one of these boot methods, type it at the prompt, optionally
+followed by any boot parameters. For example:
+ boot: install acpi=off
+
+If unsure, you should use the default boot method, with no special
+parameters, by simply pressing enter at the boot prompt.
+
+Except in expert mode, non-critical kernel boot messages are suppressed.
+
+Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install.g-i (from rev 2598, dists/trunk/live-helper/templates/syslinux/f3.txt.install.g-i)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install.g-i (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.install.g-i 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fBOOT METHODS07 09F307
+
+0fAvailable boot methods:07
+
+0flive07
+ Start the live system -- this is the default LIVE_MEDIA method.
+0flive-failsafe07
+ Start the live system in fail-safe mode.
+0finstall07 or 0finstallgui07
+ Start the installation using the normal or graphical installer.
+0fexpert07 and 0fexpertgui07
+ Start the installation in expert mode, for maximum control.
+
+To use one of these boot methods, type it at the prompt, optionally
+followed by any boot parameters. For example:
+ boot: install acpi=off
+
+If unsure, you should use the default boot method, with no special
+parameters, by simply pressing enter at the boot prompt.
+
+Except in expert mode, non-critical kernel boot messages are suppressed.
+
+Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.live (from rev 2598, dists/trunk/live-helper/templates/syslinux/f3.txt.live)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.live (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f3.txt.live 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fBOOT METHODS07 09F307
+
+0fAvailable boot methods:07
+
+0flive07
+ Start the live system -- this is the default LIVE_MEDIA method.
+0flive-failsafe07
+ Start the live system in fail-safe mode.
+
+
+
+
+
+
+
+To use one of these boot methods, type it at the prompt, optionally
+followed by any boot parameters. For example:
+ boot: live acpi=off
+
+If unsure, you should use the default boot method, with no special
+parameters, by simply pressing enter at the boot prompt.
+
+Press F1control and F then 1 for the help index, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f4.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fLIVE AND RESCUE MODES07 09F407
-
-
-0fUse one of these boot methods to start the live system07
-
-0flive07
- Start the live system in standard mode -- this is the default.
-0flive-failsafe07
- Start the live system in failsafe mode.
-
-0fUse one of these boot methods to rescue an existing install07
-
-0frescue07
- Boot into rescue mode.
-0frescuegui07
- Boot into rescue mode using the graphical installer.
-
-0fmemtest07
- Run memtest86+ (memory tester).
-0ffloppy07, 0fdisk107 or 0fdisk207
- Boot from the floppy, first or second hard disk.
-
-Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install (from rev 2598, dists/trunk/live-helper/templates/syslinux/f4.txt.install)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fRESCUE MODE07 09F407
+
+0fUse one of these boot methods to rescue an existing install07
+
+0frescue07
+ Boot into rescue mode.
+
+0fmemtest07
+ Start memtest to scan your RAM for errors.
+0ffloppy07, 0fdisk107 or 0fdisk207
+ Boot from the floppy, first or second hard disk.
+
+
+
+To use one of these boot methods, type it at the prompt, optionally
+followed by any boot parameters. For example:
+
+ boot: rescue acpi=off
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install.g-i (from rev 2598, dists/trunk/live-helper/templates/syslinux/f4.txt.install.g-i)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install.g-i (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.install.g-i 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fRESCUE MODE07 09F407
+
+0fUse one of these boot methods to rescue an existing install07
+
+0frescue07
+ Boot into rescue mode.
+0frescuegui07
+ Boot into rescue mode using the graphical installer.
+
+0fmemtest07
+ Start memtest to scan your RAM for errors.
+0ffloppy07, 0fdisk107 or 0fdisk207
+ Boot from the floppy, first or second hard disk.
+
+To use one of these boot methods, type it at the prompt, optionally
+followed by any boot parameters. For example:
+
+ boot: rescue acpi=off
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.live (from rev 2598, dists/trunk/live-helper/templates/syslinux/f4.txt.live)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.live (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f4.txt.live 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fADDITIONAL BOOT METHODS07 09F307
+
+0fAvailable boot methods:07
+
+0fmemtest07
+ Start memtest to scan your RAM for errors.
+0ffloppy07, 0fdisk107 or 0fdisk207
+ Boot from the floppy, first or second hard disk.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f5.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fSPECIAL BOOT PARAMETERS - OVERVIEW07 09F507
-
-On a few systems, you may need to specify a parameter at the 0fboot:07
-prompt in order to boot the system. For example, Linux may not be able
-to autodetect your hardware, and you may need to explicitly specify
-its location or type for it to be recognized.
-
-For more information about what boot parameters you can use, press:
-
- <09F607> -- boot parameters for special machines
- <09F707> -- boot parameters for various disk controllers
- <09F807> -- boot parameters understood by the install system
-
-Note that to specify a parameter for a particular kernel module, use the form
-module.param=value, for example: libata.atapi_enabled=1
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt (from rev 2598, dists/trunk/live-helper/templates/syslinux/f5.txt)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f5.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - OVERVIEW07 09F507
+
+On a few systems, you may need to specify a parameter at the 0fboot:07
+prompt in order to boot the system. For example, Linux may not be able
+to autodetect your hardware, and you may need to explicitly specify
+its location or type for it to be recognized.
+
+For more information about what boot parameters you can use, press:
+
+ <09F607> -- boot parameters for special machines
+ <09F707> -- boot parameters for various disk controllers
+ <09F807> -- boot parameters understood by the install system
+
+Note that to specify a parameter for a particular kernel module, use the form
+module.param=value, for example: libata.atapi_enabled=1
+
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f6.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F607
-
-You can use the following boot parameters at the 0fboot:07 prompt,
-in combination with the boot method (see <09F307>).
-If you use hex numbers you have to use the 0x prefix (e.g., 0x300).
-0f
-HARDWARE PARAMETER TO SPECIFY07
-IBM PS/1 or ValuePoint (IDE disk) 0fhd=0bcylinders0f,0bheads0f,0bsectors07
-Some IBM ThinkPads 0ffloppy.floppy=thinkpad07
-IBM Pentium Microchannel 0fmca-pentium no-hlt07
-Protect I/O port regions 0freserve=0biobase0f,0bextent07[0f,0b...07]
-Workaround faulty FPU (old machines) 0fno38707
-Laptops with screen display problems 0fvga=77107
-Use first serial port at 9600 baud 0fconsole=ttyS0,9600n807
-Force use of generic IDE driver 0fgeneric.all_generic_ide=107
-
-If you experience lockups or other hardware failures,
-disable buggy APIC interrupt routing 0fnoapic nolapic07
-
-For example:
- boot: install vga=771 noapic nolapic
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt (from rev 2598, dists/trunk/live-helper/templates/syslinux/f6.txt)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f6.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F607
+
+You can use the following boot parameters at the 0fboot:07 prompt,
+in combination with the boot method (see <09F307>).
+If you use hex numbers you have to use the 0x prefix (e.g., 0x300).
+0f
+HARDWARE PARAMETER TO SPECIFY07
+IBM PS/1 or ValuePoint (IDE disk) 0fhd=0bcylinders0f,0bheads0f,0bsectors07
+Some IBM ThinkPads 0ffloppy.floppy=thinkpad07
+Protect I/O port regions 0freserve=0biobase0f,0bextent07[0f,0b...07]
+Laptops with screen display problems 0fvga=77107
+Use first serial port at 9600 baud 0fconsole=ttyS0,9600n807
+Force use of generic IDE driver 0fgeneric.all_generic_ide=107
+
+Possible (temporary) workarounds for lockups or other hardware failures:
+disable buggy APIC interrupt routing 0fnoapic nolapic07
+(partly) disable ACPI 0facpi=noirq07 or 0facpi=off07
+disable USB 0fnousb07
+
+For example:
+ boot: install vga=771 noapic nolapic
+
+Press F1control and F then 1 for the help index, or ENTER to
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f7.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07 09F707
-
-You can use the following boot parameters at the 0fboot:07 prompt,
-in combination with the boot method (see <09F307>).
-0f
-HARDWARE PARAMETER TO SPECIFY07
-Adaptec 151x, 152x 0faha152x.aha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]]
-Adaptec 1542 0faha1542.aha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]]
-Adaptec 274x, 284x 0faic7xxx.aic7xxx=no_reset07 (enabled if non-zero)
-BusLogic SCSI Hosts 0fBusLogic.BusLogic=0biobase07
-Certain DELL machines 0faic7xxx.aic7xxx=no_probe07
-
-This list is incomplete, see the kernel's kernel-parameters.txt file
-for more.
-
-
-
-
-For example:
-
- boot: install aic7xxx.aic7xxx=no_probe
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt (from rev 2598, dists/trunk/live-helper/templates/syslinux/f7.txt)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f7.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07 09F707
+
+You can use the following boot parameters at the 0fboot:07 prompt,
+in combination with the boot method (see <09F307>).
+0f
+HARDWARE PARAMETER TO SPECIFY07
+Adaptec 151x, 152x 0faha152x.aha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]]
+Adaptec 1542 0faha1542.aha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]]
+Adaptec 274x, 284x 0faic7xxx.aic7xxx=no_reset07 (enabled if non-zero)
+BusLogic SCSI Hosts 0fBusLogic.BusLogic=0biobase07
+Certain DELL machines 0faic7xxx.aic7xxx=no_probe07
+
+This list is incomplete, see the kernel's kernel-parameters.txt file
+for more.
+
+
+
+
+
+For example:
+ boot: install aic7xxx.aic7xxx=no_probe
+
+Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f8.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 09F807
-
-You can use the following boot parameters at the 0fboot:07 prompt,
-in combination with the boot method (see <09F307>). These parameters
-control how the installer works.
-0f
-RESULT PARAMETER07
-Verbose debugging 0fDEBCONF_DEBUG=507
-Debug boot sequence 0fBOOT_DEBUG=2|307
-Disable framebuffer 0ffb=false07
-Don't probe for USB 0fdebian-installer/probe/usb=false07
-Don't start PCMCIA 0fhw-detect/start_pcmcia=false07
-Force static network config 0fnetcfg/disable_dhcp=true07
-Set keyboard map 0fbootkbd=es07
-Use Braille tty 0fbrltty=driver,device,texttable07
-Use high contrast accessibility theme 0ftheme=dark07
-Use special tasks 0ftasks="kde-desktop, standard"07
-
-For example:
-
- boot: install fb=false
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt (from rev 2598, dists/trunk/live-helper/templates/syslinux/f8.txt)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f8.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 09F807
+
+You can use the following boot parameters at the 0fboot:07 prompt,
+in combination with the boot method (see <09F307>). These parameters
+control how the installer works.
+0f
+RESULT PARAMETER07
+Verbose debugging 0fDEBCONF_DEBUG=507
+Debug boot sequence 0fBOOT_DEBUG=2|307
+Disable framebuffer 0ffb=false07
+Don't start PCMCIA 0fhw-detect/start_pcmcia=false07
+Force static network config 0fnetcfg/disable_dhcp=true07
+Set keyboard map 0fbootkbd=es07
+Use Braille tty 0fbrltty=driver,device,texttable07
+Use high contrast accessibility theme 0ftheme=dark07
+Use special tasks 0ftasks="kde-desktop, standard"07
+
+
+
+For example:
+ boot: install fb=false
+
+Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f9.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,23 +0,0 @@
- 0fGETTING HELP07 09F907
-
-If you can't install Debian, don't despair! The Debian team is ready to
-help you! We are especially interested in hearing about installation
-problems, because in general they don't happen to only 0fone07 person.
-We've either already heard about your particular problem and can dispense a
-quick fix, or we would like to hear about it and work through it with you,
-and the next user who comes up with the same problem will profit from your
-experience!
-
-See the Installation Manual or the FAQ for more information; both
-documents are available at the Debian web site, 0fhttp://www.debian.org/07
-
-
-
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.install (from rev 2598, dists/trunk/live-helper/templates/syslinux/f9.txt.install)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.install (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.install 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fGETTING HELP07 09F907
+
+If you can't install Debian, don't despair! The Debian team is ready to
+help you! We are especially interested in hearing about installation
+problems, because in general they don't happen to only 0fone07 person.
+We've either already heard about your particular problem and can dispense a
+quick fix, or we would like to hear about it and work through it with you,
+and the next user who comes up with the same problem will profit from your
+experience!
+
+See the Installation Manual or the FAQ for more information; both
+documents are available at the Debian web site, 0fhttp://www.debian.org/07
+
+If you can't run the Debian Live system, see the Installation Manual or
+the FAQ for more information; both documents are available at
+the Debian web site, 0fhttp://debian-live.alioth.debian.org/07
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.live (from rev 2598, dists/trunk/live-helper/templates/syslinux/f9.txt.live)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.live (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/f9.txt.live 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,23 @@
+ 0fGETTING HELP07 09F907
+
+If you can't run Debian, don't despair! The Debian team is ready to
+help you! We are especially interested in hearing about boot
+problems, because in general they don't happen to only 0fone07 person.
+We've either already heard about your particular problem and can dispense a
+quick fix, or we would like to hear about it and work through it with you,
+and the next user who comes up with the same problem will profit from your
+experience!
+
+See the Live Manual or the FAQ for more information; both
+documents are available at the Debian web site,
+0fhttp://debian-live.alioth.debian.org/07
+
+
+
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}
Deleted: releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/syslinux.cfg 2007-07-27 09:03:43 UTC (rev 2596)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg 2007-07-27 21:48:33 UTC (rev 2600)
@@ -1,36 +0,0 @@
-
-DISPLAY boot.txt
-
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-
-DEFAULT live
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
-
-#LABEL floppy
-# localboot 0x00
-
-#LABEL disk1
-# localboot 0x80
-
-#LABEL disk2
-# localboot 0x81
-
-#LABEL nextboot
-# localboot -1
-
-PROMPT 1
-TIMEOUT 0
Copied: releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg (from rev 2598, dists/trunk/live-helper/templates/syslinux/syslinux.cfg)
===================================================================
--- releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg (rev 0)
+++ releases/live-helper/1.0~a20-1/templates/syslinux/syslinux.cfg 2007-07-27 21:48:33 UTC (rev 2600)
@@ -0,0 +1,36 @@
+
+DISPLAY boot.txt
+
+F1 f1.txt
+F2 f2.txt
+F3 f3.txt
+F4 f4.txt
+F5 f5.txt
+F6 f6.txt
+F7 f7.txt
+F8 f8.txt
+F9 f9.txt
+F0 f10.txt
+
+DEFAULT live
+
+LINUX_LIVE
+
+LINUX_INSTALL
+
+MEMTEST
+
+LABEL floppy
+ localboot 0x00
+
+LABEL disk1
+ localboot 0x80
+
+LABEL disk2
+ localboot 0x81
+
+LABEL nextboot
+ localboot -1
+
+PROMPT 1
+TIMEOUT 0
More information about the Debian-live-changes
mailing list