[Debian-live-changes] r2347 - in releases/live-helper: . 1.0~a17-1/debian 1.0~a17-1/docs 1.0~a17-1/functions 1.0~a17-1/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Jul 2 07:38:01 UTC 2007
Author: daniel
Date: 2007-07-02 07:38:01 +0000 (Mon, 02 Jul 2007)
New Revision: 2347
Added:
releases/live-helper/1.0~a17-1/
releases/live-helper/1.0~a17-1/debian/changelog
releases/live-helper/1.0~a17-1/docs/ChangeLog
releases/live-helper/1.0~a17-1/functions/defaults.sh
releases/live-helper/1.0~a17-1/helpers/lh_binary_debian-installer
releases/live-helper/1.0~a17-1/helpers/lh_binary_disk
releases/live-helper/1.0~a17-1/helpers/lh_binary_grub
releases/live-helper/1.0~a17-1/helpers/lh_binary_includes
releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot
Removed:
releases/live-helper/1.0~a17-1/debian/changelog
releases/live-helper/1.0~a17-1/docs/ChangeLog
releases/live-helper/1.0~a17-1/functions/defaults.sh
releases/live-helper/1.0~a17-1/helpers/lh_binary_debian-installer
releases/live-helper/1.0~a17-1/helpers/lh_binary_disk
releases/live-helper/1.0~a17-1/helpers/lh_binary_grub
releases/live-helper/1.0~a17-1/helpers/lh_binary_includes
releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot
Log:
Copied: releases/live-helper/1.0~a17-1 (from rev 2342, dists/trunk/live-helper)
Deleted: releases/live-helper/1.0~a17-1/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/debian/changelog 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,128 +0,0 @@
-live-helper (1.0~a17-1) UNRELEASED; 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~a17-1/debian/changelog (from rev 2346, dists/trunk/live-helper/debian/changelog)
===================================================================
--- releases/live-helper/1.0~a17-1/debian/changelog (rev 0)
+++ releases/live-helper/1.0~a17-1/debian/changelog 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,128 @@
+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~a17-1/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/docs/ChangeLog 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,735 +0,0 @@
-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.
-
-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~a17-1/docs/ChangeLog (from rev 2346, dists/trunk/live-helper/docs/ChangeLog)
===================================================================
--- releases/live-helper/1.0~a17-1/docs/ChangeLog (rev 0)
+++ releases/live-helper/1.0~a17-1/docs/ChangeLog 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,736 @@
+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~a17-1/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/functions/defaults.sh 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,603 +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}"
-
- # 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)
- LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
- ;;
-
- ubuntu)
- LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
- ;;
- 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)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.ubuntu.org/ubuntu/"
- ;;
- esac
- fi
-
- # Setting mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_BINARY}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
- ;;
-
- ubuntu)
- LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
- ;;
- 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)
- LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
- ;;
- 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
- 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 debian-installer option
- LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
-
- # Setting live-installer option
- LIVE_LIVE_INSTALLER="${LIVE_LIVE_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 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~a17-1/functions/defaults.sh (from rev 2344, dists/trunk/live-helper/functions/defaults.sh)
===================================================================
--- releases/live-helper/1.0~a17-1/functions/defaults.sh (rev 0)
+++ releases/live-helper/1.0~a17-1/functions/defaults.sh 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,600 @@
+#!/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}"
+
+ # 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)
+ LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+ ;;
+
+ ubuntu)
+ LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
+ ;;
+ 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)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.ubuntu.org/ubuntu/"
+ ;;
+ esac
+ fi
+
+ # Setting mirror which ends up in the image
+ if [ -z "${LIVE_MIRROR_BINARY}" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
+ ;;
+
+ ubuntu)
+ LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
+ ;;
+ 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)
+ LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
+ ;;
+ 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
+ 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 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 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~a17-1/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_debian-installer 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,408 +0,0 @@
-#!/bin/sh
-
-# lh_binary_debian-installer(1) - install debian-installer 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 debian-installer 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
-
-# Setting remote d-i directories
-case "${LIVE_DEBIAN_INSTALLER}" in
- netinst)
- DI="netboot/debian-installer/i386"
- DI_GTK="netboot/gtk/debian-installer/i386"
- DI_KERNEL="linux"
- ;;
- cdrom|enabled)
- DI="cdrom"
- DI_GTK="${DI}/gtk"
- DI_KERNEL="vmlinuz"
- ;;
- disabled)
- exit 0
- ;;
- *)
- Echo_error "debian-installer flavor ${LIVE_DEBIAN_INSTALLER} not supported."
- exit 1
- ;;
-esac
-
-Echo_message "Begin installing debian-installer..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_debian-installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- DESTDIR="binary/install"
- ;;
-
- net)
- DESTDIR="tftpboot"
- DI="netboot"
-
- Echo_error "Not supported yet (FIXME)"
- exit 1
- ;;
-
- tar|usb-hdd)
- DESTDIR="binary/install"
-
- # 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
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- ;;
-
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
-
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
- fi
-fi
-
-VMLINUZ_DI="vmlinuz"
-INITRD_DI="initrd.gz"
-DESTDIR_DI="${DESTDIR}"
-
-VMLINUZ_GI="gtk/vmlinuz"
-INITRD_GI="gtk/initrd.gz"
-DESTDIR_GI="${DESTDIR}/gtk"
-
-# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ]
-then
- if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
- then
- VMLINUZ_DI="vmlinuz.di"
- INITRD_DI="initrddi.gz"
- DESTDIR_DI="${DESTDIR}"
-
- VMLINUZ_GI="vmlinuz.gi"
- INITRD_GI="initrdgi.gz"
- DESTDIR_GI="${DESTDIR}"
- fi
-fi
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR_DI}"
-
-if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
-then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/${DI_KERNEL}
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/initrd.gz
- ;;
-
- i386)
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/${DI_KERNEL}
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/initrd.gz
- ;;
- esac
-else
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
-fi
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
- mkdir -p "${DESTDIR_GI}"
-
- if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/initrd.gz
- ;;
-
- i386)
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/initrd.gz
- ;;
- esac
- else
- wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
- wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz
- fi
-fi
-
-if [ "${LIVE_DEBIAN_INSTALLER}" != "netinst" ]; then
- # Downloading additional packages
- mkdir -p chroot/binary.deb/archives/partial
- mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
- touch chroot/var/lib/dpkg/status
-
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
- ;;
-
- i386)
- DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
- ;;
-
- powerpc)
- DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
- ;;
- esac
- DI_PACKAGES="${DI_PACKAGES} cryptsetup lvm2"
-
- Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
- mv chroot/binary.deb ./
- mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-fi
-
-# Including base debian packages
-if [ -d cache/packages_bootstrap ]
-then
- for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
- do
- SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
- ;;
-
- *)
- LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
- ;;
- esac
-
- # Install directory
- mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
- # Move files
- cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
- done
-fi
-
-# Including local debs
-if ls ../config/binary_local-debs/* &> /dev/null
-then
- for FILE in ../config/binary_local-debs/*.deb
- do
- SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
- ;;
-
- *)
- LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
- ;;
- esac
-
- # Install directory
- mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
- # Move files
- cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
- done
-fi
-
-# Generating deb indices
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
-
-cd binary
-apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
-gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
-#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
-#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
-cd "${OLDPWD}"
-
-# Fetching release
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
-
-#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
-#Archive: stable
-#Version: 4.0r0
-#Component: main
-#Origin: Debian
-#Label: Debian
-#Architecture: source
-#EOF
-
-mkdir binary.udeb
-cd binary.udeb
-
-# Downloading udeb indices
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-
-# Sorting udebs
-UDEBS="`awk '/Filename: / { print $2 }' Packages`"
-
-# Downloading udebs
-for UDEB in ${UDEBS}
-do
- if [ -f ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ]
- then
- # Copying cached udebs
- cp -l ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
- else
- # Downloading udebs
- wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
- fi
-done
-
-# Caching udebs
-rm -rf ../cache/packages_debian-installer.udeb
-mkdir -p ../cache/packages_debian-installer.udeb
-cp -l *.udeb ../cache/packages_debian-installer.udeb
-
-# Including local udebs
-if ls ../config/binary_local-udebs/* &> /dev/null
-then
- for FILE in ../config/binary_local-udebs/*.udeb
- do
- SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
- ;;
-
- *)
- LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
- ;;
- esac
-
- # Install directory
- mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
-
- # Copy files
- cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
-
- # Prefere local udebs over downloaded udebs
- rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
- done
-fi
-
-# Excluding udebs
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
-
-for EXCLUDE in `cat exclude`
-do
- rm -f "${EXCLUDE}"_*.udeb
-done
-
-# Moving udebs
-for UDEB in ${UDEBS}
-do
- if [ -f "`basename ${UDEB}`" ]
- then
- mkdir -p `dirname ${UDEB}`
- mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
- fi
-done
-
-# Creating udeb indices
-mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
-gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
-
-rm -f Packages* exclude
-find . | cpio -dmpu "${OLDPWD}"/binary
-cd "${OLDPWD}"
-
-rm -rf binary.udeb
-rm -rf binary.deb
-
-# Generating release file
-apt-ftparchive \
- -o APT::FTPArchive::Release::Origin="Debian" \
- -o APT::FTPArchive::Release::Label="Debian" \
- -o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
- -o APT::FTPArchive::Release::Version="4.0" \
- -o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
- -o APT::FTPArchive::Release::Date="`date -R`" \
- -o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
- -o APT::FTPArchive::Release::Components="main" \
- -o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
-release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-
-# Creating dist symlinks
-for DISTRIBUTION in frozen stable testing unstable
-do
- ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-ln -s . binary/debian
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer
Copied: releases/live-helper/1.0~a17-1/helpers/lh_binary_debian-installer (from rev 2345, dists/trunk/live-helper/helpers/lh_binary_debian-installer)
===================================================================
--- releases/live-helper/1.0~a17-1/helpers/lh_binary_debian-installer (rev 0)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_debian-installer 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,412 @@
+#!/bin/sh
+
+# lh_binary_debian-installer(1) - install debian-installer 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 debian-installer 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
+
+# Setting remote d-i directories
+case "${LIVE_DEBIAN_INSTALLER}" in
+ netinst)
+ DI="netboot/debian-installer/i386"
+ DI_GTK="netboot/gtk/debian-installer/i386"
+ DI_KERNEL="linux"
+ ;;
+
+ cdrom|enabled)
+ DI="cdrom"
+ DI_GTK="${DI}/gtk"
+ DI_KERNEL="vmlinuz"
+ ;;
+
+ disabled)
+ exit 0
+ ;;
+
+ *)
+ Echo_error "debian-installer flavor ${LIVE_DEBIAN_INSTALLER} not supported."
+ exit 1
+ ;;
+esac
+
+Echo_message "Begin installing debian-installer..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_debian-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ DESTDIR="binary/install"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ DI="netboot"
+
+ Echo_error "Not supported yet (FIXME)"
+ exit 1
+ ;;
+
+ tar|usb-hdd)
+ DESTDIR="binary/install"
+
+ # 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
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ # Assemble multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ DESTDIR="${DESTDIR}.amd"
+ ;;
+
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ ;;
+
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ ;;
+ esac
+ fi
+fi
+
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+then
+ if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ then
+ VMLINUZ_DI="vmlinuz.di"
+ INITRD_DI="initrddi.gz"
+ DESTDIR_DI="${DESTDIR}"
+
+ VMLINUZ_GI="vmlinuz.gi"
+ INITRD_GI="initrdgi.gz"
+ DESTDIR_GI="${DESTDIR}"
+ fi
+fi
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR_DI}"
+
+if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
+then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/${DI_KERNEL}
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/initrd.gz
+ ;;
+
+ i386)
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/${DI_KERNEL}
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/initrd.gz
+ ;;
+ esac
+else
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+fi
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+ mkdir -p "${DESTDIR_GI}"
+
+ if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/initrd.gz
+ ;;
+
+ i386)
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/initrd.gz
+ ;;
+ esac
+ else
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz
+ fi
+fi
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "netinst" ]; then
+ # Downloading additional packages
+ mkdir -p chroot/binary.deb/archives/partial
+ mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+ touch chroot/var/lib/dpkg/status
+
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
+ ;;
+
+ i386)
+ DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
+ ;;
+
+ powerpc)
+ DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
+ ;;
+ esac
+
+ DI_PACKAGES="${DI_PACKAGES} cryptsetup lvm2"
+
+ Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
+ mv chroot/binary.deb ./
+ mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+fi
+
+# Including base debian packages
+if [ -d cache/packages_bootstrap ]
+then
+ for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
+ do
+ SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+ if [ -z "${SOURCE}" ]
+ then
+ SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+ fi
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+ ;;
+
+ *)
+ LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ done
+fi
+
+# Including local debs
+if ls ../config/binary_local-debs/* &> /dev/null
+then
+ for FILE in ../config/binary_local-debs/*.deb
+ do
+ SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+ if [ -z "${SOURCE}" ]
+ then
+ SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+ fi
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+ ;;
+
+ *)
+ LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ done
+fi
+
+# Generating deb indices
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cd binary
+apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
+#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+cd "${OLDPWD}"
+
+# Fetching release
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
+
+#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
+#Archive: stable
+#Version: 4.0r0
+#Component: main
+#Origin: Debian
+#Label: Debian
+#Architecture: source
+#EOF
+
+mkdir binary.udeb
+cd binary.udeb
+
+# Downloading udeb indices
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+
+# Sorting udebs
+UDEBS="`awk '/Filename: / { print $2 }' Packages`"
+
+# Downloading udebs
+for UDEB in ${UDEBS}
+do
+ if [ -f ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ]
+ then
+ # Copying cached udebs
+ cp -l ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
+ else
+ # Downloading udebs
+ wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+ fi
+done
+
+# Caching udebs
+rm -rf ../cache/packages_debian-installer.udeb
+mkdir -p ../cache/packages_debian-installer.udeb
+cp -l *.udeb ../cache/packages_debian-installer.udeb
+
+# Including local udebs
+if ls ../config/binary_local-udebs/* &> /dev/null
+then
+ for FILE in ../config/binary_local-udebs/*.udeb
+ do
+ SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+ if [ -z "${SOURCE}" ]
+ then
+ SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+ fi
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+ ;;
+
+ *)
+ LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Copy files
+ cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Prefere local udebs over downloaded udebs
+ rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
+ done
+fi
+
+# Excluding udebs
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
+
+for EXCLUDE in `cat exclude`
+do
+ rm -f "${EXCLUDE}"_*.udeb
+done
+
+# Moving udebs
+for UDEB in ${UDEBS}
+do
+ if [ -f "`basename ${UDEB}`" ]
+ then
+ mkdir -p `dirname ${UDEB}`
+ mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
+ fi
+done
+
+# Creating udeb indices
+mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
+
+rm -f Packages* exclude
+find . | cpio -dmpu "${OLDPWD}"/binary
+cd "${OLDPWD}"
+
+rm -rf binary.udeb
+rm -rf binary.deb
+
+# Generating release file
+apt-ftparchive \
+ -o APT::FTPArchive::Release::Origin="Debian" \
+ -o APT::FTPArchive::Release::Label="Debian" \
+ -o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Version="4.0" \
+ -o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Date="`date -R`" \
+ -o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
+ -o APT::FTPArchive::Release::Components="main" \
+ -o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
+release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+
+# Creating dist symlinks
+for DISTRIBUTION in frozen stable testing unstable
+do
+ ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+ln -s . binary/debian
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer
Deleted: releases/live-helper/1.0~a17-1/helpers/lh_binary_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_disk 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_disk 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# lh_binary_disk (1) - install disk information 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 disk information 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_BINARY_IMAGES}" != "iso" ]
-then
- exit 0
-fi
-
-Echo_message "Begin installing disk information..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_disk
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-mkdir -p binary/.disk
-
-ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
-DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
-DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
-eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
-
-case "${LH_MODE}" in
- debian)
- if [ -d binary/pool/main/b/base-installer ]
- then
- if [ -d binary/pool/main/l/live-installer ]
- then
- TYPE="LIVE/INSTALL"
- fi
-
- TYPE="LIVE/NETINST"
- else
- TYPE="LIVE"
- fi
-
- echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
- ;;
-
- ubuntu)
- echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
- # Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
- ;;
-esac
-
-if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
-then
- echo "main" > binary/.disk/base_components
-
- touch binary/.disk/base_installable
-
- echo "not_complete" > binary/.disk/cd_type
-
- #touch binary/.disk/mkisofs
-
-cat > binary/.disk/udeb_include << EOF
-netcfg
-ethdetect
-pcmcia-cs-udeb
-pcmciautils-udeb
-wireless-tools-udeb
-EOF
-
- if [ -d binary/pool/main/l/live-installer ]
- then
- echo "live-installer" >> binary/.disk/udeb_include
- fi
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_disk
Copied: releases/live-helper/1.0~a17-1/helpers/lh_binary_disk (from rev 2343, dists/trunk/live-helper/helpers/lh_binary_disk)
===================================================================
--- releases/live-helper/1.0~a17-1/helpers/lh_binary_disk (rev 0)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_disk 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# lh_binary_disk (1) - install disk information 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 disk information 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_BINARY_IMAGES}" != "iso" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin installing disk information..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_disk
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+mkdir -p binary/.disk
+
+ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+
+case "${LH_MODE}" in
+ debian)
+ if [ -d binary/pool/main/b/base-installer ]
+ then
+ if [ -d binary/pool/main/l/live-installer ]
+ then
+ TYPE="LIVE/INSTALL"
+ fi
+
+ TYPE="LIVE/NETINST"
+ else
+ TYPE="LIVE"
+ fi
+
+ echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+ ;;
+
+ ubuntu)
+ echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+ # Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
+ ;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
+ echo "main" > binary/.disk/base_components
+
+ touch binary/.disk/base_installable
+
+ echo "not_complete" > binary/.disk/cd_type
+
+ #touch binary/.disk/mkisofs
+
+cat > binary/.disk/udeb_include << EOF
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
+EOF
+
+ if [ -d binary/pool/main/l/live-installer ]
+ then
+ echo "live-installer" >> binary/.disk/udeb_include
+ fi
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_disk
Deleted: releases/live-helper/1.0~a17-1/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_grub 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,270 +0,0 @@
-#!/bin/sh
-
-# lh_binary_grub(1) - installs grub 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 grub 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}" != "grub" ]
-then
- exit 0
-fi
-
-Echo_message "Begin installing grub..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
-# Checking grub templates
-Check_templates grub
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture amd64 i386
-
-# Checking depends
-Check_package chroot/usr/sbin/grub grub
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso|tar)
- case "${LH_INITRAMFS}" in
- casper)
- DESTDIR_LIVE="binary/casper"
- ;;
-
- live-initramfs)
- DESTDIR_LIVE="binary/live"
- ;;
- esac
-
- DESTDIR_INSTALL="binary/install"
- ;;
-
- usb-hdd|net)
- Echo_error "not yet supported, aborting (FIXME)."
- exit 1
- ;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
- ;;
-
- i386)
- DESTDIR_LIVE="${DESTDIR_LIVE}.386"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
- ;;
- esac
- fi
-fi
-
-# 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} username=${LIVE_HOSTNAME}"
- fi
- ;;
- esac
-fi
-
-if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
-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_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-
-LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- else
- LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- fi
- done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
-then
- LINUX="title\t\tLive:\nroot\n\n${LINUX}"
-
- LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-fi
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
- MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-# Copying templates
-mkdir -p binary/boot/grub
-cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
-
-# Copyring grub
-case ${LIVE_BINARY_IMAGES} in
- iso)
- cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
- ;;
-
- tar|usb-hdd)
- cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2 binary/boot/grub
- ;;
-esac
-
-# Copying splash screen
-if [ -f config/binary_grub/splash.xpm.gz ]
-then
- LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
-fi
-
-if [ -n "${LIVE_GRUB_SPLASH}" ]
-then
- if [ "${LIVE_GRUB_SPLASH}" = "none" ]
- then
- # Removing splash file
- rm -f binary/boot/grub/splash.xpm.gz
-
- # Removing splash entry
- sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
- else
- # Overwriting splash file
- cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
- fi
-fi
-
-# Configure grub templates
-cat >> binary/boot/grub/menu.lst << EOF
-
-title Other:
-root
-
-LIVE_MEMTEST
-EOF
-
-sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
-sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_grub
Copied: releases/live-helper/1.0~a17-1/helpers/lh_binary_grub (from rev 2343, dists/trunk/live-helper/helpers/lh_binary_grub)
===================================================================
--- releases/live-helper/1.0~a17-1/helpers/lh_binary_grub (rev 0)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_grub 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,270 @@
+#!/bin/sh
+
+# lh_binary_grub(1) - installs grub 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 grub 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}" != "grub" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin installing grub..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
+# Checking grub templates
+Check_templates grub
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture amd64 i386
+
+# Checking depends
+Check_package chroot/usr/sbin/grub grub
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso|tar)
+ case "${LH_INITRAMFS}" in
+ casper)
+ DESTDIR_LIVE="binary/casper"
+ ;;
+
+ live-initramfs)
+ DESTDIR_LIVE="binary/live"
+ ;;
+ esac
+
+ DESTDIR_INSTALL="binary/install"
+ ;;
+
+ usb-hdd|net)
+ Echo_error "not yet supported, aborting (FIXME)."
+ exit 1
+ ;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ # Assemble multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+ ;;
+
+ i386)
+ DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+ ;;
+ esac
+ fi
+fi
+
+# 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} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
+fi
+
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+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_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+ for KERNEL in chroot/boot/vmlinuz*
+ do
+ if [ -z "${LINUX}" ]
+ then
+ LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+ LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+ else
+ LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+ LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+ fi
+ done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
+ LINUX="title\t\tLive:\nroot\n\n${LINUX}"
+
+ LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+fi
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+ MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
+ MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+# Copying templates
+mkdir -p binary/boot/grub
+cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
+
+# Copyring grub
+case ${LIVE_BINARY_IMAGES} in
+ iso)
+ cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
+ ;;
+
+ tar|usb-hdd)
+ cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2 binary/boot/grub
+ ;;
+esac
+
+# Copying splash screen
+if [ -f config/binary_grub/splash.xpm.gz ]
+then
+ LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+fi
+
+if [ -n "${LIVE_GRUB_SPLASH}" ]
+then
+ if [ "${LIVE_GRUB_SPLASH}" = "none" ]
+ then
+ # Removing splash file
+ rm -f binary/boot/grub/splash.xpm.gz
+
+ # Removing splash entry
+ sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
+ else
+ # Overwriting splash file
+ cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
+ fi
+fi
+
+# Configure grub templates
+cat >> binary/boot/grub/menu.lst << EOF
+
+title Other:
+root
+
+LIVE_MEMTEST
+EOF
+
+sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_grub
Deleted: releases/live-helper/1.0~a17-1/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_includes 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,165 +0,0 @@
-#!/bin/sh
-
-# lh_binary_includes(1) - copy files 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="copy files 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_INCLUDES}" = "none" ]
-then
- exit 0
-fi
-
-Echo_message "Begin copying binary includes..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check user includes
-if [ ! -d "${LIVE_INCLUDES}" ]
-then
- if [ -d ../"${LIVE_INCLUDES}" ]
- then
- LIVE_INCLUDES="../${LIVE_INCLUDES}"
- else
- Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
- exit 1
- fi
-fi
-
-# Checking local includes
-if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
-then
- LIVE_INCLUDES="config/includes"
-fi
-
-# Assemble architecture
-case "${LIVE_ARCHITECTURE}" in
- amd64)
- ARCH="amd"
- ;;
-
- i386)
- ARCH="386"
- ;;
-
- powerpc)
- ARCH="ppc"
- ;;
-esac
-
-# Working arround vfat limitations
-if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
-then
- CP_OPTIONS="-L"
-fi
-
-# Copying common templates
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* &> /dev/null
-then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* binary
-fi
-
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}" ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* &> /dev/null
-then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* binary
-fi
-
-# Copying live templates
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
-then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
-fi
-
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
-then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
-fi
-
-
-if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
-then
- # Copying install templates
- if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
- ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
- then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
- fi
-
- if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
- ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
- then
- cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
- fi
-
- # Adjusting install templates
- ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
- DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
- DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
- eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
-
- if [ -d binary/pool/main/l/live-installer ]
- then
- TYPE="LIVE/INSTALL"
- fi
-
- TYPE="LIVE/NETINST"
-
- DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`"
- DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
-
- if [ "${LIVE_ARCHITECTURE}" = "i386" ]
- then
- DEBIAN_TOOLS_HTML=" <P>\n <tt> \n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt> \n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
- DEBIAN_TOOLS_TXT="/tools/ and /install/floppy/"
- else
- DEBIAN_TOOLS_HTML=" <P>\n <tt> \n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
- DEBIAN_TOOLS_TXT="/tools/"
- fi
-
- sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
- sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_includes
Copied: releases/live-helper/1.0~a17-1/helpers/lh_binary_includes (from rev 2343, dists/trunk/live-helper/helpers/lh_binary_includes)
===================================================================
--- releases/live-helper/1.0~a17-1/helpers/lh_binary_includes (rev 0)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_includes 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,165 @@
+#!/bin/sh
+
+# lh_binary_includes(1) - copy files 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="copy files 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_INCLUDES}" = "none" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin copying binary includes..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check user includes
+if [ ! -d "${LIVE_INCLUDES}" ]
+then
+ if [ -d ../"${LIVE_INCLUDES}" ]
+ then
+ LIVE_INCLUDES="../${LIVE_INCLUDES}"
+ else
+ Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
+ exit 1
+ fi
+fi
+
+# Checking local includes
+if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
+then
+ LIVE_INCLUDES="config/includes"
+fi
+
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ ARCH="amd"
+ ;;
+
+ i386)
+ ARCH="386"
+ ;;
+
+ powerpc)
+ ARCH="ppc"
+ ;;
+esac
+
+# Working arround vfat limitations
+if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+then
+ CP_OPTIONS="-L"
+fi
+
+# Copying common templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* &> /dev/null
+then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* &> /dev/null
+then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* binary
+fi
+
+# Copying live templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
+then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
+fi
+
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
+ # Copying install templates
+ if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+ ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+ then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+ fi
+
+ if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+ ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+ then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+ fi
+
+ # Adjusting install templates
+ ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+ DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+ DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+ eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+
+ if [ -d binary/pool/main/l/live-installer ]
+ then
+ TYPE="LIVE/INSTALL"
+ fi
+
+ TYPE="LIVE/NETINST"
+
+ DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`"
+ DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+ if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ then
+ DEBIAN_TOOLS_HTML=" <P>\n <tt> \n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt> \n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+ DEBIAN_TOOLS_TXT="/tools/ and /install/floppy/"
+ else
+ DEBIAN_TOOLS_HTML=" <P>\n <tt> \n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+ DEBIAN_TOOLS_TXT="/tools/"
+ fi
+
+ sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
+ sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_includes
Deleted: releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,493 +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
-
-# Installing depends
-Install_package
-
-# Local methods
-Syslinux_live_entry ()
-{
- LABEL="${1}"
- KERNEL="${2}"
- INITRD="${3}"
- APPEND="${4}"
-
- # pxelinux and syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "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}"
-
- # pxelinux and syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
- then
- DIRECTORY="/`basename ${DESTDIR_INSTALL}`"
- KERNEL="${DIRECTORY}/${KERNEL}"
- INITRD="${DIRECTORY}/${INITRD}"
- 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"
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- DESTDIR_LIVE="binary"
- DESTDIR_INSTALL="binary"
- fi
- ;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assembling multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
- ;;
-
- i386)
- DESTDIR_LIVE="${DESTDIR_LIVE}.386"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
- ;;
- esac
- fi
-fi
-
-# 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
-
-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 [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${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 ${APPEND_DI}"
- Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true ${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}`/"
-
- # pxelinux and syslinux << 3.36 lacks support to file/path
- if [ "${LIVE_BINARY_IMAGES}" = "net" ] || [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- KERNEL_PATH=""
- fi
-
- MEMTEST="LABEL ${KERNEL_PATH}memtest\n\tkernel memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- # Copying syslinux
- mkdir -p binary/isolinux
- cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
- cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
-
- # 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
-
- # Remove unused files
- rm -f binary/isolinux/pxelinux.cfg
-
- # 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
- cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
-
- # Install syslinux templates
- mkdir -p tftpboot/pxelinux.cfg
- cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
- mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
- 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_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" 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
-
- # Remove unused files
- rm -f tftpboot/pxelinux.cfg/isolinux.cfg
-
- # Working arround syslinux 8.3 limitation
- 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" 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
- ;;
-
- 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}"
- cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
- cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
- mv "${DESTDIR}"/isolinux.cfg "${DESTDIR}"/syslinux.cfg
-
- # 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
-
- # Remove unused files
- rm -f "${DESTDIR}"/pxelinux.cfg
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`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
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux
Copied: releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux (from rev 2343, dists/trunk/live-helper/helpers/lh_binary_syslinux)
===================================================================
--- releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux (rev 0)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_syslinux 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,493 @@
+#!/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
+
+# Installing depends
+Install_package
+
+# Local methods
+Syslinux_live_entry ()
+{
+ LABEL="${1}"
+ KERNEL="${2}"
+ INITRD="${3}"
+ APPEND="${4}"
+
+ # pxelinux and syslinux << 3.36 lacks support to file/path
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "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}"
+
+ # pxelinux and syslinux << 3.36 lacks support to file/path
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
+ then
+ DIRECTORY="/`basename ${DESTDIR_INSTALL}`"
+ KERNEL="${DIRECTORY}/${KERNEL}"
+ INITRD="${DIRECTORY}/${INITRD}"
+ 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"
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ DESTDIR_LIVE="binary"
+ DESTDIR_INSTALL="binary"
+ fi
+ ;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ # Assembling multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+ ;;
+
+ i386)
+ DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+ ;;
+ esac
+ fi
+fi
+
+# 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
+
+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 ${APPEND_DI}"
+ Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true ${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}`/"
+
+ # pxelinux and syslinux << 3.36 lacks support to file/path
+ if [ "${LIVE_BINARY_IMAGES}" = "net" ] || [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ KERNEL_PATH=""
+ fi
+
+ MEMTEST="LABEL ${KERNEL_PATH}memtest\n\tkernel memtest"
+ MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ # Copying syslinux
+ mkdir -p binary/isolinux
+ cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+ cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
+
+ # 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
+
+ # Remove unused files
+ rm -f binary/isolinux/pxelinux.cfg
+
+ # 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
+ cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+
+ # Install syslinux templates
+ mkdir -p tftpboot/pxelinux.cfg
+ cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
+ mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
+ 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_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" 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
+
+ # Remove unused files
+ rm -f tftpboot/pxelinux.cfg/isolinux.cfg
+
+ # Working arround syslinux 8.3 limitation
+ 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" 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
+ ;;
+
+ 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}"
+ cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+ cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+ mv "${DESTDIR}"/isolinux.cfg "${DESTDIR}"/syslinux.cfg
+
+ # 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
+
+ # Remove unused files
+ rm -f "${DESTDIR}"/pxelinux.cfg
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`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
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux
Deleted: releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-07-02 06:28:10 UTC (rev 2342)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot 2007-07-02 07:38:01 UTC (rev 2347)
@@ -1,234 +0,0 @@
-#!/bin/sh
-
-# lh_binary_yaboot(1) - installs yaboot 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 yaboot 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}" != "yaboot" ]
-then
- exit 0
-fi
-
-Echo_message "Begin installing yaboot..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_yaboot
-
-# Checking yaboot templates
-Check_templates yaboot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture powerpc ppc64
-
-# Checking depends
-Check_package chroot/usr/lib/yaboot/yaboot yaboot
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- DESTDIR_LIVE="binary/live"
- DESTDIR_INSTALL="binary/install"
- ;;
-
- net|tar|usb-hdd)
- Echo_error "not supported, FIXME"
- ;;
-esac
-
-# Temporary check for broken syslinux FIXME
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assembling multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- powerpc)
- DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
- ;;
- esac
- fi
-fi
-
-# 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
-
-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" # FIXME
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="image=/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-else
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="image=`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-fi
-
-# FIXME
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinux*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- else
- LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- fi
- else
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- else
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- fi
- fi
- done
-fi
-
-# Removing '//'
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
-then
- VMLINUZ_DI="vmlinuz"
- INITRD_DI="initrd.gz"
-
- VMLINUZ_GI="gtk/vmlinuz"
- INITRD_GI="gtk/initrd.gz"
-
- LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-
- LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-fi
-
-LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
-
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- # Copying yaboot
- mkdir -p binary/yaboot
- cp chroot/usr/lib/yaboot/yaboot binary/yaboot
- cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
-
- # Configure yaboot templates
- sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" binary/yaboot/yaboot.conf
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot
Copied: releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot (from rev 2343, dists/trunk/live-helper/helpers/lh_binary_yaboot)
===================================================================
--- releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot (rev 0)
+++ releases/live-helper/1.0~a17-1/helpers/lh_binary_yaboot 2007-07-02 07:38:01 UTC (rev 2347)
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+# lh_binary_yaboot(1) - installs yaboot 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 yaboot 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}" != "yaboot" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin installing yaboot..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_yaboot
+
+# Checking yaboot templates
+Check_templates yaboot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture powerpc ppc64
+
+# Checking depends
+Check_package chroot/usr/lib/yaboot/yaboot yaboot
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
+ ;;
+
+ net|tar|usb-hdd)
+ Echo_error "not supported, FIXME"
+ ;;
+esac
+
+# Temporary check for broken syslinux FIXME
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ # Assembling multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ powerpc)
+ DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
+ ;;
+ esac
+ fi
+fi
+
+# 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
+
+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" # FIXME
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+ LINUX="image=/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+else
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+ LINUX="image=`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+fi
+
+# FIXME
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+ for KERNEL in chroot/boot/vmlinux*
+ do
+ if [ -z "${LINUX}" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ else
+ LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ fi
+ else
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ else
+ LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ fi
+ fi
+ done
+fi
+
+# Removing '//'
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+fi
+
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ # Copying yaboot
+ mkdir -p binary/yaboot
+ cp chroot/usr/lib/yaboot/yaboot binary/yaboot
+ cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
+
+ # Configure yaboot templates
+ sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" binary/yaboot/yaboot.conf
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
+ sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot
More information about the Debian-live-changes
mailing list