[Debian-live-changes] r1946 - dists/sid dists/sid/live-helper/debian dists/sid/live-helper/docs dists/sid/live-helper/examples/cron dists/sid/live-helper/functions dists/sid/live-helper/helpers dists/sid/live-helper/includes/etch/live releases/live-helper releases/live-helper/1.0~a13-1/debian releases/live-helper/1.0~a13-1/docs releases/live-helper/1.0~a13-1/examples/cron releases/live-helper/1.0~a13-1/functions releases/live-helper/1.0~a13-1/helpers releases/live-helper/1.0~a13-1/includes/etch/live
daniel at alioth.debian.org
daniel at alioth.debian.org
Sun Jun 3 13:30:51 UTC 2007
Author: daniel
Date: 2007-06-03 13:30:50 +0000 (Sun, 03 Jun 2007)
New Revision: 1946
Added:
dists/sid/live-helper/
dists/sid/live-helper/debian/changelog
dists/sid/live-helper/docs/ChangeLog
dists/sid/live-helper/examples/cron/snapshots.sh
dists/sid/live-helper/functions/defaults.sh
dists/sid/live-helper/helpers/lh_binary
dists/sid/live-helper/helpers/lh_binary_chroot
dists/sid/live-helper/helpers/lh_binary_debian-installer
dists/sid/live-helper/helpers/lh_binary_encryption
dists/sid/live-helper/helpers/lh_binary_grub
dists/sid/live-helper/helpers/lh_binary_hdd
dists/sid/live-helper/helpers/lh_binary_includes
dists/sid/live-helper/helpers/lh_binary_iso
dists/sid/live-helper/helpers/lh_binary_linux-image
dists/sid/live-helper/helpers/lh_binary_local-includes
dists/sid/live-helper/helpers/lh_binary_manifest
dists/sid/live-helper/helpers/lh_binary_md5sum
dists/sid/live-helper/helpers/lh_binary_memtest
dists/sid/live-helper/helpers/lh_binary_net
dists/sid/live-helper/helpers/lh_binary_rootfs
dists/sid/live-helper/helpers/lh_binary_syslinux
dists/sid/live-helper/helpers/lh_binary_usb-hdd
dists/sid/live-helper/helpers/lh_binary_yaboot
dists/sid/live-helper/helpers/lh_bootstrap
dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap
dists/sid/live-helper/helpers/lh_bootstrap_debootstrap
dists/sid/live-helper/helpers/lh_build
dists/sid/live-helper/helpers/lh_chroot
dists/sid/live-helper/helpers/lh_chroot_apt
dists/sid/live-helper/helpers/lh_chroot_debianchroot
dists/sid/live-helper/helpers/lh_chroot_hacks
dists/sid/live-helper/helpers/lh_chroot_hooks
dists/sid/live-helper/helpers/lh_chroot_hosts
dists/sid/live-helper/helpers/lh_chroot_interactive
dists/sid/live-helper/helpers/lh_chroot_linux-image
dists/sid/live-helper/helpers/lh_chroot_local-hooks
dists/sid/live-helper/helpers/lh_chroot_local-includes
dists/sid/live-helper/helpers/lh_chroot_local-packages
dists/sid/live-helper/helpers/lh_chroot_local-packageslists
dists/sid/live-helper/helpers/lh_chroot_localization
dists/sid/live-helper/helpers/lh_chroot_packages
dists/sid/live-helper/helpers/lh_chroot_packageslists
dists/sid/live-helper/helpers/lh_chroot_preseed
dists/sid/live-helper/helpers/lh_chroot_proc
dists/sid/live-helper/helpers/lh_chroot_resolv
dists/sid/live-helper/helpers/lh_chroot_sources
dists/sid/live-helper/helpers/lh_chroot_symlinks
dists/sid/live-helper/helpers/lh_chroot_sysfs
dists/sid/live-helper/helpers/lh_chroot_sysvinit
dists/sid/live-helper/helpers/lh_chroot_sysvrc
dists/sid/live-helper/helpers/lh_chroot_tasks
dists/sid/live-helper/helpers/lh_clean
dists/sid/live-helper/helpers/lh_config
dists/sid/live-helper/helpers/lh_losetup
dists/sid/live-helper/helpers/lh_source
dists/sid/live-helper/helpers/lh_source_debian
dists/sid/live-helper/helpers/lh_source_debian-live
dists/sid/live-helper/helpers/lh_source_generic
dists/sid/live-helper/helpers/lh_source_hdd
dists/sid/live-helper/helpers/lh_source_iso
dists/sid/live-helper/helpers/lh_source_md5sum
dists/sid/live-helper/helpers/lh_source_net
dists/sid/live-helper/helpers/lh_source_usb-hdd
dists/sid/live-helper/helpers/lh_testroot
dists/sid/live-helper/helpers/make-live
dists/sid/live-helper/includes/etch/live/boot-parameters.txt
releases/live-helper/1.0~a13-1/
releases/live-helper/1.0~a13-1/debian/changelog
releases/live-helper/1.0~a13-1/docs/ChangeLog
releases/live-helper/1.0~a13-1/examples/cron/snapshots.sh
releases/live-helper/1.0~a13-1/functions/defaults.sh
releases/live-helper/1.0~a13-1/helpers/lh_binary
releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot
releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer
releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption
releases/live-helper/1.0~a13-1/helpers/lh_binary_grub
releases/live-helper/1.0~a13-1/helpers/lh_binary_hdd
releases/live-helper/1.0~a13-1/helpers/lh_binary_includes
releases/live-helper/1.0~a13-1/helpers/lh_binary_iso
releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image
releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes
releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest
releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum
releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest
releases/live-helper/1.0~a13-1/helpers/lh_binary_net
releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs
releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd
releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot
releases/live-helper/1.0~a13-1/helpers/lh_bootstrap
releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap
releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap
releases/live-helper/1.0~a13-1/helpers/lh_build
releases/live-helper/1.0~a13-1/helpers/lh_chroot
releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt
releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot
releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts
releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive
releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists
releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization
releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages
releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists
releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed
releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc
releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources
releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc
releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks
releases/live-helper/1.0~a13-1/helpers/lh_clean
releases/live-helper/1.0~a13-1/helpers/lh_config
releases/live-helper/1.0~a13-1/helpers/lh_losetup
releases/live-helper/1.0~a13-1/helpers/lh_source
releases/live-helper/1.0~a13-1/helpers/lh_source_debian
releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live
releases/live-helper/1.0~a13-1/helpers/lh_source_generic
releases/live-helper/1.0~a13-1/helpers/lh_source_hdd
releases/live-helper/1.0~a13-1/helpers/lh_source_iso
releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum
releases/live-helper/1.0~a13-1/helpers/lh_source_net
releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd
releases/live-helper/1.0~a13-1/helpers/lh_testroot
releases/live-helper/1.0~a13-1/helpers/make-live
releases/live-helper/1.0~a13-1/includes/etch/live/boot-parameters.txt
Removed:
dists/sid/live-helper/debian/changelog
dists/sid/live-helper/docs/ChangeLog
dists/sid/live-helper/examples/cron/snapshots.sh
dists/sid/live-helper/functions/defaults.sh
dists/sid/live-helper/helpers/lh_binary
dists/sid/live-helper/helpers/lh_binary_chroot
dists/sid/live-helper/helpers/lh_binary_debian-installer
dists/sid/live-helper/helpers/lh_binary_encryption
dists/sid/live-helper/helpers/lh_binary_grub
dists/sid/live-helper/helpers/lh_binary_hdd
dists/sid/live-helper/helpers/lh_binary_includes
dists/sid/live-helper/helpers/lh_binary_iso
dists/sid/live-helper/helpers/lh_binary_linux-image
dists/sid/live-helper/helpers/lh_binary_local-includes
dists/sid/live-helper/helpers/lh_binary_manifest
dists/sid/live-helper/helpers/lh_binary_md5sum
dists/sid/live-helper/helpers/lh_binary_memtest
dists/sid/live-helper/helpers/lh_binary_net
dists/sid/live-helper/helpers/lh_binary_rootfs
dists/sid/live-helper/helpers/lh_binary_syslinux
dists/sid/live-helper/helpers/lh_binary_usb-hdd
dists/sid/live-helper/helpers/lh_binary_yaboot
dists/sid/live-helper/helpers/lh_bootstrap
dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap
dists/sid/live-helper/helpers/lh_bootstrap_debootstrap
dists/sid/live-helper/helpers/lh_build
dists/sid/live-helper/helpers/lh_chroot
dists/sid/live-helper/helpers/lh_chroot_apt
dists/sid/live-helper/helpers/lh_chroot_debianchroot
dists/sid/live-helper/helpers/lh_chroot_hacks
dists/sid/live-helper/helpers/lh_chroot_hooks
dists/sid/live-helper/helpers/lh_chroot_hosts
dists/sid/live-helper/helpers/lh_chroot_interactive
dists/sid/live-helper/helpers/lh_chroot_linux-image
dists/sid/live-helper/helpers/lh_chroot_local-hooks
dists/sid/live-helper/helpers/lh_chroot_local-includes
dists/sid/live-helper/helpers/lh_chroot_local-packages
dists/sid/live-helper/helpers/lh_chroot_local-packageslists
dists/sid/live-helper/helpers/lh_chroot_localization
dists/sid/live-helper/helpers/lh_chroot_packages
dists/sid/live-helper/helpers/lh_chroot_packageslists
dists/sid/live-helper/helpers/lh_chroot_preseed
dists/sid/live-helper/helpers/lh_chroot_proc
dists/sid/live-helper/helpers/lh_chroot_resolv
dists/sid/live-helper/helpers/lh_chroot_sources
dists/sid/live-helper/helpers/lh_chroot_symlinks
dists/sid/live-helper/helpers/lh_chroot_sysfs
dists/sid/live-helper/helpers/lh_chroot_sysvinit
dists/sid/live-helper/helpers/lh_chroot_sysvrc
dists/sid/live-helper/helpers/lh_chroot_tasks
dists/sid/live-helper/helpers/lh_clean
dists/sid/live-helper/helpers/lh_config
dists/sid/live-helper/helpers/lh_losetup
dists/sid/live-helper/helpers/lh_source
dists/sid/live-helper/helpers/lh_source_debian
dists/sid/live-helper/helpers/lh_source_debian-live
dists/sid/live-helper/helpers/lh_source_generic
dists/sid/live-helper/helpers/lh_source_hdd
dists/sid/live-helper/helpers/lh_source_iso
dists/sid/live-helper/helpers/lh_source_md5sum
dists/sid/live-helper/helpers/lh_source_net
dists/sid/live-helper/helpers/lh_source_usb-hdd
dists/sid/live-helper/helpers/lh_testroot
dists/sid/live-helper/helpers/make-live
releases/live-helper/1.0~a13-1/debian/changelog
releases/live-helper/1.0~a13-1/docs/ChangeLog
releases/live-helper/1.0~a13-1/examples/cron/snapshots.sh
releases/live-helper/1.0~a13-1/functions/defaults.sh
releases/live-helper/1.0~a13-1/helpers/lh_binary
releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot
releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer
releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption
releases/live-helper/1.0~a13-1/helpers/lh_binary_grub
releases/live-helper/1.0~a13-1/helpers/lh_binary_hdd
releases/live-helper/1.0~a13-1/helpers/lh_binary_includes
releases/live-helper/1.0~a13-1/helpers/lh_binary_iso
releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image
releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes
releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest
releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum
releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest
releases/live-helper/1.0~a13-1/helpers/lh_binary_net
releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs
releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd
releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot
releases/live-helper/1.0~a13-1/helpers/lh_bootstrap
releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap
releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap
releases/live-helper/1.0~a13-1/helpers/lh_build
releases/live-helper/1.0~a13-1/helpers/lh_chroot
releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt
releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot
releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts
releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive
releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages
releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists
releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization
releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages
releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists
releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed
releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc
releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources
releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit
releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc
releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks
releases/live-helper/1.0~a13-1/helpers/lh_clean
releases/live-helper/1.0~a13-1/helpers/lh_config
releases/live-helper/1.0~a13-1/helpers/lh_losetup
releases/live-helper/1.0~a13-1/helpers/lh_source
releases/live-helper/1.0~a13-1/helpers/lh_source_debian
releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live
releases/live-helper/1.0~a13-1/helpers/lh_source_generic
releases/live-helper/1.0~a13-1/helpers/lh_source_hdd
releases/live-helper/1.0~a13-1/helpers/lh_source_iso
releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum
releases/live-helper/1.0~a13-1/helpers/lh_source_net
releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd
releases/live-helper/1.0~a13-1/helpers/lh_testroot
releases/live-helper/1.0~a13-1/helpers/make-live
Log:
Copied: dists/sid/live-helper (from rev 1932, dists/trunk/live-helper)
Deleted: dists/sid/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/debian/changelog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,101 +0,0 @@
-live-helper (1.0~a13-1) UNRELEASED; 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: dists/sid/live-helper/debian/changelog (from rev 1945, dists/trunk/live-helper/debian/changelog)
===================================================================
--- dists/sid/live-helper/debian/changelog (rev 0)
+++ dists/sid/live-helper/debian/changelog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,101 @@
+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: dists/sid/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/docs/ChangeLog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,612 +0,0 @@
-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: dists/sid/live-helper/docs/ChangeLog (from rev 1945, dists/trunk/live-helper/docs/ChangeLog)
===================================================================
--- dists/sid/live-helper/docs/ChangeLog (rev 0)
+++ dists/sid/live-helper/docs/ChangeLog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,616 @@
+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: dists/sid/live-helper/examples/cron/snapshots.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/snapshots.sh 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/examples/cron/snapshots.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-# Needs: build-essential fakeroot lsb-release svn [...]
-
-# Static variables
-PACKAGES="live-helper live-initramfs live-sysvinit live-webhelper"
-
-DEBEMAIL="debian-live-devel at lists.alioth.debian.org"
-EMAIL="debian-live-devel at lists.alioth.debian.org"
-DEBFULLNAME="Debian Live Autobuilder"
-NAME="Debian Live Autobuilder"
-
-export DEBEMAIL EMAIL DEBFULLNAME NAME
-
-TEMPDIR="/srv/tmp/svn-snapshots"
-SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshots"
-
-DATE_START="`date -R`"
-
-# Checking lock file
-if [ -f "${SERVER}"/Archive-Update-in-Progress ]
-then
- echo "E: locked."
- exit 1
-fi
-
-# Creating server directory
-if [ ! -d "${SERVER}" ]
-then
- mkdir -p "${SERVER}"
-fi
-
-# Creating lock trap
-trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Update-in-Progress; exit 0" 0 1 2 3 9 15
-
-# Creating lock file
-echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
-
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin snapshot build." >> /var/log/live
-
-# Processing packages
-for PACKAGE in ${PACKAGES}
-do
- # Cleaning build directory
- if [ -d "${TEMPDIR}" ]
- then
- rm -rf "${TEMPDIR}"
- fi
-
- # Creating build directory
- mkdir -p "${TEMPDIR}"
-
- # Getting sources
- cd "${TEMPDIR}"
- svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
-
- # Getting version
- cd "${TEMPDIR}"/${PACKAGE}
- VERSION="`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }'`"
-
- # Getting revision
- cd "${TEMPDIR}"/${PACKAGE}
- REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`"
-
- # Check for existing package
- if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ]
- then
- UPDATE_INDICES="true"
-
- # Renaming directory
- mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
-
- # Building package
- cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
- find . -type d -name .svn | xargs rm -rf
- dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}.
- dpkg-buildpackage -rfakeroot -sa -uc -us
-
- # Removing sources
- rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
-
- # Creating directory
- if [ ! -d "${SERVER}" ]
- then
- mkdir -p "${SERVER}"
- fi
-
- # Removing old packages
- rm -f "${SERVER}"/"${PACKAGE}"*
- # FIXME: parse ${SERVER}/${PACKAGE}*.changes
-
- # Moving packages
- mv "${TEMPDIR}"/${PACKAGE}* "${SERVER}"
- else
- # Remove sources
- rm -rf "${TEMPDIR}"/${PACKAGE}
- fi
-done
-
-if [ "${UPDATE_INDICES}" = "true" ]
-then
- LAST_UPDATE="`date -R`"
-
- cd "${SERVER}"
-
- # Updating binary indices
- apt-ftparchive packages ./ > Packages
- gzip -9 -c Packages > Packages.gz
-
- # Updating source indices
- apt-ftparchive sources ./ > Sources
- gzip -9 -c Sources > Sources.gz
-fi
-
-# Reading timestamp
-if [ -z "${LAST_UPDATE}" ]
-then
- LAST_UPDATE="`awk -F: '/Last update:/ { print $2":"$3":"$4 }' ${SERVER}/LAST_BUILD | sed -e 's/ //'`"
-fi
-
-# Writing timestamp
-cat > "${SERVER}"/LAST_BUILD << EOF
-Last run begin: ${DATE_START}
-Last run end: `date -R`
-
-Last update: ${LAST_UPDATE}
-EOF
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end snapshot build." >> /var/log/live
Copied: dists/sid/live-helper/examples/cron/snapshots.sh (from rev 1937, dists/trunk/live-helper/examples/cron/snapshots.sh)
===================================================================
--- dists/sid/live-helper/examples/cron/snapshots.sh (rev 0)
+++ dists/sid/live-helper/examples/cron/snapshots.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Needs: build-essential fakeroot lsb-release svn [...]
+
+# Static variables
+PACKAGES="live-helper live-initramfs live-sysvinit live-webhelper"
+
+DEBEMAIL="debian-live-devel at lists.alioth.debian.org"
+EMAIL="debian-live-devel at lists.alioth.debian.org"
+DEBFULLNAME="Debian Live Autobuilder"
+NAME="Debian Live Autobuilder"
+
+export DEBEMAIL EMAIL DEBFULLNAME NAME
+
+TEMPDIR="/srv/tmp/svn-snapshots"
+SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshots"
+
+DATE_START="`date -R`"
+
+# Checking lock file
+if [ -f "${SERVER}"/Archive-Update-in-Progress ]
+then
+ echo "E: locked."
+ exit 1
+fi
+
+# Creating server directory
+if [ ! -d "${SERVER}" ]
+then
+ mkdir -p "${SERVER}"
+fi
+
+# Creating lock trap
+trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Update-in-Progress; exit 0" 0 1 2 3 9 15
+
+# Creating lock file
+echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin snapshot build." >> /var/log/live
+
+# Processing packages
+for PACKAGE in ${PACKAGES}
+do
+ # Cleaning build directory
+ if [ -d "${TEMPDIR}" ]
+ then
+ rm -rf "${TEMPDIR}"
+ fi
+
+ # Creating build directory
+ mkdir -p "${TEMPDIR}"
+
+ # Getting sources
+ cd "${TEMPDIR}"
+ svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
+
+ # Getting version
+ cd "${TEMPDIR}"/${PACKAGE}
+ VERSION="`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }'`"
+
+ # Getting revision
+ cd "${TEMPDIR}"/${PACKAGE}
+ REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`"
+
+ # Check for existing package
+ if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ]
+ then
+ UPDATE_INDICES="true"
+
+ # Renaming directory
+ mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
+
+ # Building package
+ cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
+ find . -type d -name .svn | xargs rm -rf
+ dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}.
+ dpkg-buildpackage -rfakeroot -sa -uc -us
+
+ # Removing sources
+ rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
+
+ # Creating directory
+ mkdir -p "${SERVER}"
+
+ # Removing old packages
+ for FILE in `awk {'print $5'} "${SERVER}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$"`
+ do
+ rm -f "${SERVER}"/"${FILE}"
+ done
+
+ rm -f "${SERVER}"/"${PACKAGE}"*.changes
+
+ # Installing new packages
+ for FILE in `awk {'print $5'} "${TEMPDIR}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$"`
+ do
+ mv "${TEMPDIR}"/"${FILE}" "${SERVER}"
+ done
+
+ mv "${TEMPDIR}"/"${PACKAGE}"*.changes "${SERVER}"
+ else
+ # Remove sources
+ rm -rf "${TEMPDIR}"/${PACKAGE}
+ fi
+done
+
+if [ "${UPDATE_INDICES}" = "true" ]
+then
+ LAST_UPDATE="`date -R`"
+
+ cd "${SERVER}"
+
+ # Updating binary indices
+ apt-ftparchive packages ./ > Packages
+ gzip -9 -c Packages > Packages.gz
+
+ # Updating source indices
+ apt-ftparchive sources ./ > Sources
+ gzip -9 -c Sources > Sources.gz
+fi
+
+# Reading timestamp
+if [ -z "${LAST_UPDATE}" ]
+then
+ LAST_UPDATE="`awk -F: '/Last update:/ { print $2":"$3":"$4 }' ${SERVER}/LAST_BUILD | sed -e 's/ //'`"
+fi
+
+# Writing timestamp
+cat > "${SERVER}"/LAST_BUILD << EOF
+Last run begin: ${DATE_START}
+Last run end: `date -R`
+
+Last update: ${LAST_UPDATE}
+EOF
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end snapshot build." >> /var/log/live
Deleted: dists/sid/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/functions/defaults.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,583 +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 value
- 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 "${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 we are root, disable root command
- if [ "`id -u`" = "0" ]
- then
- # FIXME: this is disabled until considered safe
- LIVE_ROOT_COMMAND=""
- 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}"
-
- # 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 "E: 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="E: 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 "E: 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 squashfs-modules-2.6 unionfs-modules-2.6"
- ;;
-
- ubuntu)
- LIVE_LINUX_PACKAGES="linux-image"
- ;;
- esac
-
- if [ -n "${LIVE_ENCRYPTION}" ]
- then
- LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
- fi
- fi
-
- # Setting packages string
- # LIVE_PACKAGES
-
- # Setting packages list string
- LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
-
- # Setting tasks string
- for LIST in ${LIVE_PACKAGES_LISTS}
- do
- case "${LIST}" in
- mini|minimal)
- LH_APT="apt-get"
- ;;
-
- gnome-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
- ;;
-
- kde-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
- ;;
-
- xfce-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
- ;;
- esac
- done
-
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
-
- # Setting tasks
- # LIVE_TASKS
-
- # Setting security updates option
- 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:-generic}"
-}
Copied: dists/sid/live-helper/functions/defaults.sh (from rev 1940, dists/trunk/live-helper/functions/defaults.sh)
===================================================================
--- dists/sid/live-helper/functions/defaults.sh (rev 0)
+++ dists/sid/live-helper/functions/defaults.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,583 @@
+#!/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 value
+ 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 "${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 we are root, disable root command
+ if [ "`id -u`" = "0" ]
+ then
+ # FIXME: this is disabled until considered safe
+ LIVE_ROOT_COMMAND=""
+ 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}"
+
+ # 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 "E: 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="E: 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 "E: 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 squashfs-modules-2.6 unionfs-modules-2.6"
+ ;;
+
+ ubuntu)
+ LIVE_LINUX_PACKAGES="linux-image"
+ ;;
+ esac
+
+ if [ -n "${LIVE_ENCRYPTION}" ]
+ then
+ LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
+ fi
+ fi
+
+ # Setting packages string
+ # LIVE_PACKAGES
+
+ # Setting packages list string
+ LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
+
+ # Setting tasks string
+ for LIST in ${LIVE_PACKAGES_LISTS}
+ do
+ case "${LIST}" in
+ mini|minimal)
+ LH_APT="apt-get"
+ ;;
+
+ gnome-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
+ ;;
+
+ kde-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
+ ;;
+
+ xfce-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
+ ;;
+ esac
+ done
+
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
+
+ # Setting tasks
+ # LIVE_TASKS
+
+ # Setting security updates option
+ 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:-generic}"
+}
Deleted: dists/sid/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# lh_binary(1) - build binary images
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build binary images"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Preparing root filesystem
-lh_binary_chroot ${*}
-
-# Configuring chroot
-lh_chroot_proc install ${*}
-lh_chroot_sysfs install ${*}
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_sources install ${*}
-
-# Building root filesystem
-lh_binary_rootfs ${*}
-lh_binary_manifest ${*}
-lh_binary_encryption ${*}
-
-# Prepare images
-lh_binary_linux-image ${*}
-lh_binary_debian-installer ${*}
-lh_binary_memtest ${*}
-lh_binary_grub ${*}
-lh_binary_syslinux ${*}
-lh_binary_yaboot ${*}
-lh_binary_includes ${*}
-lh_binary_local-includes ${*}
-lh_binary_md5sum ${*}
-
-# Building images
-lh_binary_hdd ${*}
-lh_binary_iso ${*}
-lh_binary_net ${*}
-lh_binary_usb-hdd ${*}
-
-# Deconfiguring chroot
-rm -f .stage/chroot_sources
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
-lh_chroot_sysfs remove ${*}
-lh_chroot_proc remove ${*}
Copied: dists/sid/live-helper/helpers/lh_binary (from rev 1940, dists/trunk/live-helper/helpers/lh_binary)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_binary(1) - build binary images
+# 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="build binary images"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Preparing root filesystem
+lh_binary_chroot ${*}
+
+# Configuring chroot
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_sources install ${*}
+
+# Building root filesystem
+lh_binary_rootfs ${*}
+lh_binary_manifest ${*}
+lh_binary_encryption ${*}
+
+# Prepare images
+lh_binary_linux-image ${*}
+lh_binary_debian-installer ${*}
+lh_binary_memtest ${*}
+lh_binary_grub ${*}
+lh_binary_syslinux ${*}
+lh_binary_yaboot ${*}
+lh_binary_includes ${*}
+lh_binary_local-includes ${*}
+lh_binary_md5sum ${*}
+
+# Building images
+lh_binary_hdd ${*}
+lh_binary_iso ${*}
+lh_binary_net ${*}
+lh_binary_usb-hdd ${*}
+
+# Deconfiguring chroot
+rm -f .stage/chroot_sources
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
Deleted: dists/sid/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# lh_binary_chroot(1) - copy chroot into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="copy chroot into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin copying chroot..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_chroot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Normally, virtual filesystems are not mounted here, but people tend to be lazy
-if [ -f chroot/proc/version ]
-then
- ${LH_ROOT_COMMAND} umount chroot/proc
-fi
-
-if [ -d chroot/sys/kernel ]
-then
- ${LH_ROOT_COMMAND} umount chroot/sys
-fi
-
-# Removing old chroot
-${LH_ROOT_COMMAND} rm -rf chroot/chroot
-${LH_ROOT_COMMAND} rm -rf chroot.tmp
-
-# Copying new chroot
-${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
-${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
-
-if [ -n "${LH_ROOT_COMMAND}" ]
-then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_chroot
Copied: dists/sid/live-helper/helpers/lh_binary_chroot (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_chroot)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_chroot (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# lh_binary_chroot(1) - copy chroot into chroot
+# 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 chroot into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin copying chroot..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_chroot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Normally, virtual filesystems are not mounted here, but people tend to be lazy
+if [ -f chroot/proc/version ]
+then
+ ${LH_ROOT_COMMAND} umount chroot/proc
+fi
+
+if [ -d chroot/sys/kernel ]
+then
+ ${LH_ROOT_COMMAND} umount chroot/sys
+fi
+
+# Removing old chroot
+${LH_ROOT_COMMAND} rm -rf chroot/chroot
+${LH_ROOT_COMMAND} rm -rf chroot.tmp
+
+# Copying new chroot
+${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
+${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_chroot
Deleted: dists/sid/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_debian-installer 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,302 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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
-
-if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
-then
- exit 0
-fi
-
-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"
- DESTDIR_INSTALLER="cdrom"
- ;;
-
- net)
- DESTDIR="tftpboot"
- DESTDIR_INSTALLER="netboot"
-
- Echo_error "Not supported yet (FIXME)"
- exit 1
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/install"
- fi
- else
- DESTDIR="binary/install"
- fi
-
- DESTDIR_INSTALLER="hd-media"
- ;;
-esac
-
-# 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
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
-
-# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
-then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- fi
- else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- fi
-else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-fi
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
-fi
-
-FIXME ()
-{
-# Downloading udebs
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
-
-for DISTRIBUTION in frozen stable testing unstable
-do
- ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
-UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
-
-rm -f packages.di
-
-for UDEB in ${UDEBS}
-do
- mkdir -p binary/`dirname ${UDEB}`
- cd binary/`dirname ${UDEB}`
- wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
- cd "${OLDPWD}"
-done
-
-# Downloading debs
-if [ -d cache/packages_bootstrap ]
-then
- for FILE in cache/packages_bootstrap/*.deb
- do
- SOURCE="`dpkg -f ${FILE} Source`"
-
- 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
-
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
-
-cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: ${LIVE_DISTRIBUTION}
-Component: main
-Origin: Debian
-Label: Debian
-Architecture: ${LIVE_ARCHITECTURE}
-EOF
-
-mkdir -p cache/indices_debian-installer
-
-cat > cache/indices_debian-installer/archive << EOF
-Dir
-{
- ArchiveDir "binary";
- // OverrideDir "";
- // CacheDir "";
- FileListDir "cache/indices_debian-installer";
-};
-
-Default
-{
- Packages::Compress ". gzip";
- // Packages::Extension ".deb";
- // Sources::Extensions ".dsc";
- // Contents::Compress "gzip";
- // DeLinkLimit "0";
- // FileMode "0644";
-};
-
-TreeDefault
-{
- // MaxContentsChange
- // ContentsAge
- Directory "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
- Packages "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
- InternalPrefix "dists/\$(DIST)/\$(SECTION)/";
- Contents "dists/\$(DIST)/Contents-\$(ARCH)";
- // Contents::Header
- // BinCacheDB "cache.\$(DIST).\$(SECTION).\$(ARCH)";
- // FileList "filelist.\$(DIST).\$(SECTION).\$(ARCH)";
- FileList "filelist";
- // BinOverride "override.\$(DIST).\$(SECTION)";
-};
-
-tree "${LIVE_DISTRIBUTION}"
-{
- Sections "main";
- Architectures "${LIVE_ARCHITECTURE}";
-};
-EOF
-
-cd binary
-find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
-cd "${OLDPWD}"
-
-cat > cache/indices_debian-installer/release << EOF
-APT::FTPArchive::Release::Origin "Debian";
-APT::FTPArchive::Release::Label "Debian";
-APT::FTPArchive::Release::Suite "${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Version "4.0";
-APT::FTPArchive::Release::Codename "${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Date "`date -R`";
-APT::FTPArchive::Release::Architectures "${LIVE_ARCHITECTURE}";
-APT::FTPArchive::Release::Components "main";
-EOF
-
-apt-ftparchive generate cache/indices_debian-installer/archive
-apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-}
-
-mkdir binary/.disk
-echo "main" > binary/.disk/base_components
-touch binary/.disk/base_installable
-echo "not_complete" > binary/.disk/cd_type
-#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
-touch binary/.disk/mkisofs
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer
Copied: dists/sid/live-helper/helpers/lh_binary_debian-installer (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_debian-installer)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_debian-installer (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_debian-installer 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,304 @@
+#!/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
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
+then
+ exit 0
+fi
+
+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"
+ DESTDIR_INSTALLER="cdrom"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ DESTDIR_INSTALLER="netboot"
+
+ Echo_error "Not supported yet (FIXME)"
+ exit 1
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/install"
+ fi
+ else
+ DESTDIR="binary/install"
+ fi
+
+ DESTDIR_INSTALLER="hd-media"
+ ;;
+esac
+
+# 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
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR}"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ fi
+ else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ fi
+else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+fi
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+fi
+
+FIXME ()
+{
+# Downloading udebs
+mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+cd "${OLDPWD}"
+
+for DISTRIBUTION in frozen stable testing unstable
+do
+ ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
+UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
+
+rm -f packages.di
+
+for UDEB in ${UDEBS}
+do
+ mkdir -p binary/`dirname ${UDEB}`
+ cd binary/`dirname ${UDEB}`
+ wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+ cd "${OLDPWD}"
+done
+
+# Downloading debs
+if [ -d cache/packages_bootstrap ]
+then
+ for FILE in cache/packages_bootstrap/*.deb
+ do
+ SOURCE="`dpkg -f ${FILE} Source`"
+
+ 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
+
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
+Archive: ${LIVE_DISTRIBUTION}
+Component: main
+Origin: Debian
+Label: Debian
+Architecture: ${LIVE_ARCHITECTURE}
+EOF
+
+mkdir -p cache/indices_debian-installer
+
+cat > cache/indices_debian-installer/archive << EOF
+Dir
+{
+ ArchiveDir "binary";
+ // OverrideDir "";
+ // CacheDir "";
+ FileListDir "cache/indices_debian-installer";
+};
+
+Default
+{
+ Packages::Compress ". gzip";
+ // Packages::Extension ".deb";
+ // Sources::Extensions ".dsc";
+ // Contents::Compress "gzip";
+ // DeLinkLimit "0";
+ // FileMode "0644";
+};
+
+TreeDefault
+{
+ // MaxContentsChange
+ // ContentsAge
+ Directory "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
+ Packages "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
+ InternalPrefix "dists/\$(DIST)/\$(SECTION)/";
+ Contents "dists/\$(DIST)/Contents-\$(ARCH)";
+ // Contents::Header
+ // BinCacheDB "cache.\$(DIST).\$(SECTION).\$(ARCH)";
+ // FileList "filelist.\$(DIST).\$(SECTION).\$(ARCH)";
+ FileList "filelist";
+ // BinOverride "override.\$(DIST).\$(SECTION)";
+};
+
+tree "${LIVE_DISTRIBUTION}"
+{
+ Sections "main";
+ Architectures "${LIVE_ARCHITECTURE}";
+};
+EOF
+
+cd binary
+find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
+cd "${OLDPWD}"
+
+cat > cache/indices_debian-installer/release << EOF
+APT::FTPArchive::Release::Origin "Debian";
+APT::FTPArchive::Release::Label "Debian";
+APT::FTPArchive::Release::Suite "${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Version "4.0";
+APT::FTPArchive::Release::Codename "${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Date "`date -R`";
+APT::FTPArchive::Release::Architectures "${LIVE_ARCHITECTURE}";
+APT::FTPArchive::Release::Components "main";
+EOF
+
+apt-ftparchive generate cache/indices_debian-installer/archive
+apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+}
+
+mkdir binary/.disk
+echo "main" > binary/.disk/base_components
+touch binary/.disk/base_installable
+echo "not_complete" > binary/.disk/cd_type
+#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
+touch binary/.disk/mkisofs
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer
Deleted: dists/sid/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_encryption 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# lh_binary_encryption(1) - encrypts rootfs
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="encrypts rootfs"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ -z "${LIVE_ENCRYPTION}" ]
-then
- exit 0
-fi
-
-Echo_message "Begin encrypting root filesystem image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/binary_rootfs
-
-# Checking stage file
-Check_stagefile .stage/binary_encryption
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-case "${LIVE_CHROOT_FILESYSTEM}" in
- ext2)
- ROOTFS="ext2"
- ;;
-
- plain)
- Echo_warning "encryption not supported on plain filesystem."
- exit 0
- ;;
-
- squashfs)
- ROOTFS="squashfs"
- ;;
-esac
-
-# Checking depends
-Check_package chroot/usr/bin/aespipe aespipe
-
-# Installing depends
-Install_package
-
-# Moving image
-mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot
-
-echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
-
-cat >> chroot/encrypt.sh << EOF
-while true
-do
- cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
-
- echo -n "Something went wrong... Retry? [YES/no] "
-
- read ANSWER
-
- if [ "no" = "${ANSWER}" ]
- then
- unset ANSWER
- break
- fi
-done
-EOF
-
-Chroot "sh encrypt.sh"
-
-# Move image
-mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
-rm -f chroot/encrypt.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_encryption
Copied: dists/sid/live-helper/helpers/lh_binary_encryption (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_encryption)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_encryption (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_encryption 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+# lh_binary_encryption(1) - encrypts rootfs
+# 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="encrypts rootfs"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ -z "${LIVE_ENCRYPTION}" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin encrypting root filesystem image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/binary_rootfs
+
+# Checking stage file
+Check_stagefile .stage/binary_encryption
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+case "${LIVE_CHROOT_FILESYSTEM}" in
+ ext2)
+ ROOTFS="ext2"
+ ;;
+
+ plain)
+ Echo_warning "encryption not supported on plain filesystem."
+ exit 0
+ ;;
+
+ squashfs)
+ ROOTFS="squashfs"
+ ;;
+esac
+
+# Checking depends
+Check_package chroot/usr/bin/aespipe aespipe
+
+# Installing depends
+Install_package
+
+# Moving image
+mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot
+
+echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
+
+cat >> chroot/encrypt.sh << EOF
+while true
+do
+ cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
+
+ echo -n "Something went wrong... Retry? [YES/no] "
+
+ read ANSWER
+
+ if [ "no" = "${ANSWER}" ]
+ then
+ unset ANSWER
+ break
+ fi
+done
+EOF
+
+Chroot "sh encrypt.sh"
+
+# Move image
+mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
+rm -f chroot/encrypt.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_encryption
Deleted: dists/sid/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_grub 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,288 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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 lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- Echo_warning "skipping binary_grub, foreign architecture."
- exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
- if [ -d ../"${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
- else
- Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
- exit 1
- fi
-fi
-
-# Check local templates
-if [ -d config/templates/grub ]
-then
- LIVE_TEMPLATES="config/templates"
-fi
-
-# 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|usb-hdd|hdd)
- DESTDIR_LIVE="binary/live"
- DESTDIR_INSTALL="binary/install"
- ;;
-
- net)
- Echo_error "not 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 "${LIVE_INITRAMFS}" in
- casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
- ;;
-
- live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
- then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
- fi
- ;;
- esac
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
-
-# 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}" = "enabled" ]
-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"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-fi
-
-# Assembling memtest configuration
-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
- ;;
-
- usb-hdd|hdd)
- cp chroot/usr/lib/grub/*/stage1 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: dists/sid/live-helper/helpers/lh_binary_grub (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_grub)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_grub (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_grub 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,290 @@
+#!/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 lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ Echo_warning "skipping binary_grub, foreign architecture."
+ exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+ if [ -d ../"${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+ else
+ Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+ exit 1
+ fi
+fi
+
+# Check local templates
+if [ -d config/templates/grub ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
+# 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|usb-hdd|hdd)
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
+ ;;
+
+ net)
+ Echo_error "not 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 "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+
+# 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}" = "enabled" ]
+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"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+fi
+
+# Assembling memtest configuration
+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
+ ;;
+
+ usb-hdd|hdd)
+ cp chroot/usr/lib/grub/*/stage1 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: dists/sid/live-helper/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# lh_binary_hdd(1) - build harddisk binary image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build harddisk binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building binary harddisk image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old binary
-rm -f binary-hdd.tar.gz
-
-tar cfz binary-hdd.tar.gz binary
-
-# Creating stage file
-Create_stagefile .stage/binary_hdd
Copied: dists/sid/live-helper/helpers/lh_binary_hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_hdd)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_hdd (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# lh_binary_hdd(1) - build harddisk binary image
+# 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="build harddisk binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary harddisk image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old binary
+rm -f binary-hdd.tar.gz
+
+tar cfz binary-hdd.tar.gz binary
+
+# Creating stage file
+Create_stagefile .stage/binary_hdd
Deleted: dists/sid/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,124 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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
-
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
- # Working arround vfat limitations
- if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
- then
- CP_OPTIONS="-L"
- fi
-
- # Copying d-i 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 d-i templates
- DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
- DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
-
- if [ "${LIVE_ARCHITECTURE}" = "i386" ]
- 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: dists/sid/live-helper/helpers/lh_binary_includes (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_includes)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_includes (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,126 @@
+#!/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
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+ # Working arround vfat limitations
+ if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+ then
+ CP_OPTIONS="-L"
+ fi
+
+ # Copying d-i 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 d-i templates
+ DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+ DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+ if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ 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: dists/sid/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,137 +0,0 @@
-#!/bin/sh
-
-# lh_binary_iso(1) - build iso binary image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build iso binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
-then
- exit 0
-fi
-
-Echo_message "Begin building binary iso image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_iso
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
-
-# Installing depends
-Install_package
-
-# Remove old iso image
-if [ -f binary.iso ]
-then
- rm -f binary.iso
-fi
-
-if [ "${LH_VERBOSE}" = "enabled" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-fi
-
-if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
-fi
-
-if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
-fi
-
-if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
-fi
-
-if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
-fi
-
-# Moving image
-mv binary chroot
-
-# Create image
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
-then
- case "${LIVE_BOOTLOADER}" in
- grub)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
-
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
- fi
- ;;
-
- syslinux)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
- fi
- ;;
-
- *)
- Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
- sleep 5
- ;;
- esac
-
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-fi
-
-cat >> chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
-EOF
-
-Chroot "sh binary.sh"
-
-# Move image
-mv chroot/binary chroot/binary.iso ./
-rm -f chroot/binary.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_iso
Copied: dists/sid/live-helper/helpers/lh_binary_iso (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_iso)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_iso (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# lh_binary_iso(1) - build iso binary image
+# 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="build iso binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f binary.iso ]
+then
+ rm -f binary.iso
+fi
+
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
+
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv binary chroot
+
+# Create image
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
+then
+ case "${LIVE_BOOTLOADER}" in
+ grub)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+ fi
+ ;;
+
+ syslinux)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+ fi
+ ;;
+
+ *)
+ Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+ sleep 5
+ ;;
+ esac
+
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+fi
+
+cat >> chroot/binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
+EOF
+
+Chroot "sh binary.sh"
+
+# Move image
+mv chroot/binary chroot/binary.iso ./
+rm -f chroot/binary.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_iso
Deleted: dists/sid/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install linux-image into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin install linux-image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_linux-image
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/live"
- fi
- else
- DESTDIR="binary/live"
- fi
- ;;
-esac
-
-# 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
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing linux-image
-cp chroot/boot/vmlinuz* "${DESTDIR}"
-cp chroot/boot/initrd.img* "${DESTDIR}"
-
-# Creating stage file
-Create_stagefile .stage/binary_linux-image
Copied: dists/sid/live-helper/helpers/lh_binary_linux-image (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_linux-image)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_linux-image (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# lh_binary_linux-image(1) - install linux-image into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install linux-image into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin install linux-image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_linux-image
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing initrd backup files
+rm -f chroot/boot/initrd*bak*
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ DESTDIR="binary/live"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/live"
+ fi
+ else
+ DESTDIR="binary/live"
+ fi
+ ;;
+esac
+
+# 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
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing linux-image
+cp chroot/boot/vmlinuz* "${DESTDIR}"
+cp chroot/boot/initrd.img* "${DESTDIR}"
+
+# Creating stage file
+Create_stagefile .stage/binary_linux-image
Deleted: dists/sid/live-helper/helpers/lh_binary_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# lh_binary_local-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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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
-
-Echo_message "Begin copying binary local includes..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/binary_local-includes/* > /dev/null 2>&1
-then
- # Copying includes
- cd config/binary_local-includes
- find . | cpio -dmpu "${OLDPWD}"/binary
- cd "${OLDPWD}"
-
- # Removing symlinks
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
- then
- find binary -type l | xargs rm -f
- fi
-
- # Creating stage file
- Create_stagefile .stage/binary_local-includes
-fi
Copied: dists/sid/live-helper/helpers/lh_binary_local-includes (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_local-includes)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_local-includes (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_binary_local-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
+
+Echo_message "Begin copying binary local includes..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/binary_local-includes/* > /dev/null 2>&1
+then
+ # Copying includes
+ cd config/binary_local-includes
+ find . | cpio -dmpu "${OLDPWD}"/binary
+ cd "${OLDPWD}"
+
+ # Removing symlinks
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ then
+ find binary -type l | xargs rm -f
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/binary_local-includes
+fi
Deleted: dists/sid/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_manifest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# lh_binary_manifest(1) - create manifest
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create manifest"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin creating manifest..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_manifest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Add filesystem.manifest
-Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest
-
-# Add packages.list
-Chroot "dpkg -l" > packages.txt
-
-# Creating stage file
-Create_stagefile .stage/binary_manifest
Copied: dists/sid/live-helper/helpers/lh_binary_manifest (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_manifest)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_manifest (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_manifest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# lh_binary_manifest(1) - create manifest
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create manifest"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin creating manifest..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_manifest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Add filesystem.manifest
+Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest
+
+# Add packages.list
+Chroot "dpkg -l" > packages.txt
+
+# Creating stage file
+Create_stagefile .stage/binary_manifest
Deleted: dists/sid/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# lh_binary_md5sum(1) - create binary md5sums
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create binary md5sums"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin creating binary md5sum.txt..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_md5sum
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old md5sums
-if [ -f binary/md5sum.txt ]
-then
- rm -f binary/md5sum.txt
-fi
-
-# Calculating md5sums
-cd binary
-find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt
-mv ../md5sum.txt ./
-
-cd "${OLDPWD}"
-
-# Creating stage file
-Create_stagefile .stage/binary_md5sum
Copied: dists/sid/live-helper/helpers/lh_binary_md5sum (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_md5sum)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_md5sum (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# lh_binary_md5sum(1) - create binary md5sums
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create binary md5sums"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin creating binary md5sum.txt..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_md5sum
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old md5sums
+if [ -f binary/md5sum.txt ]
+then
+ rm -f binary/md5sum.txt
+fi
+
+# Calculating md5sums
+cd binary
+find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt
+mv ../md5sum.txt ./
+
+cd "${OLDPWD}"
+
+# Creating stage file
+Create_stagefile .stage/binary_md5sum
Deleted: dists/sid/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_memtest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest(1) - installs a memtest 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="installs a memtest 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_MEMTEST}" = "disabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin installing memtest..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- Echo_warning "skipping binary_memtest, foreign architecture."
- exit 0
-fi
-
-# Checking depends
-case "${LIVE_MEMTEST}" in
- memtest86)
- Check_package chroot/boot/memtest86.bin memtest86
- ;;
-
- memtest86+)
- Check_package chroot/boot/memtest86+.bin memtest86+
- ;;
-esac
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/live"
- fi
- else
- DESTDIR="binary/live"
- fi
- ;;
-esac
-
-# 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"
- ;;
- esac
- fi
-fi
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing memtest
-case "${LIVE_MEMTEST}" in
- memtest86)
- cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
- ;;
-
- memtest86+)
- cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_memtest
Copied: dists/sid/live-helper/helpers/lh_binary_memtest (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_memtest)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_memtest (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_memtest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest 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 a memtest 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_MEMTEST}" = "disabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin installing memtest..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ Echo_warning "skipping binary_memtest, foreign architecture."
+ exit 0
+fi
+
+# Checking depends
+case "${LIVE_MEMTEST}" in
+ memtest86)
+ Check_package chroot/boot/memtest86.bin memtest86
+ ;;
+
+ memtest86+)
+ Check_package chroot/boot/memtest86+.bin memtest86+
+ ;;
+esac
+
+# Installing depends
+Install_package
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ DESTDIR="binary/live"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/live"
+ fi
+ else
+ DESTDIR="binary/live"
+ fi
+ ;;
+esac
+
+# 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"
+ ;;
+ esac
+ fi
+fi
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing memtest
+case "${LIVE_MEMTEST}" in
+ memtest86)
+ cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
+ ;;
+
+ memtest86+)
+ cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest
Deleted: dists/sid/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# lh_binary_net(1) - build netboot binary image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build netboot binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
-then
- exit 0
-fi
-
-Echo_message "Begin building binary netboot image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_net
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old binary
-if [ -f binary-net.tar.gz ]
-then
- rm -f binary-net.tar.gz
-fi
-
-# Creating image file
-if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
-then
- mv chroot chroot.tmp
-fi
-
-mv binary "`basename ${LIVE_NET_PATH}`"
-
-cd ..
-tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
-mv binary-net.tar.gz "${OLDPWD}"
-cd "${OLDPWD}"
-
-mv "`basename ${LIVE_NET_PATH}`" binary
-
-if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
-then
- mv chroot.tmp chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_net
Copied: dists/sid/live-helper/helpers/lh_binary_net (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_net)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_net (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# lh_binary_net(1) - build netboot binary image
+# 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="build netboot binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary netboot image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_net
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old binary
+if [ -f binary-net.tar.gz ]
+then
+ rm -f binary-net.tar.gz
+fi
+
+# Creating image file
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+ mv chroot chroot.tmp
+fi
+
+mv binary "`basename ${LIVE_NET_PATH}`"
+
+cd ..
+tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+mv binary-net.tar.gz "${OLDPWD}"
+cd "${OLDPWD}"
+
+mv "`basename ${LIVE_NET_PATH}`" binary
+
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+ mv chroot.tmp chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_net
Deleted: dists/sid/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_rootfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,149 +0,0 @@
-#!/bin/sh
-
-# lh_binary_rootfs(1) - build rootfs image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build rootfs image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin building root filesystem image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/binary_chroot
-
-# Checking stage file
-Check_stagefile .stage/binary_rootfs
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Creating directory
-mkdir -p binary/${INITFS}
-
-case "${LIVE_CHROOT_FILESYSTEM}" in
- ext2)
- # Checking depends
- Check_package chroot/usr/bin/genext2fs genext2fs
-
- # Installing depends
- Install_package
-
- # Remove old ext2 image
- if [ -f binary/${INITFS}/filesystem.ext2 ]
- then
- rm -f binary/${INITFS}/filesystem.ext2
- fi
-
- DU_DIM="`du -ks chroot | cut -f1`"
- REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
-
- Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
-
- # Move image
- mv chroot/filesystem.ext2 binary/${INITFS}
- rm -rf chroot/chroot
-
- # Removing depends
- Remove_package
- ;;
-
- plain)
- if [ -d binary/${INITFS}/filesystem.dir ]
- then
- rm -rf binary/${INITFS}/filesystem.dir
- fi
-
- mv chroot/chroot binary/${INITFS}/filesystem.dir
- ;;
-
- squashfs)
- # Checking depends
- Check_package chroot/usr/sbin/mksquashfs squashfs-tools
-
- # Installing depends
- Install_package
-
- # Remove old squashfs image
- if [ -f binary/${INITFS}/filesystem.squashfs ]
- then
- rm -f binary/${INITFS}/filesystem.squashfs
- fi
-
- if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
- fi
-
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
- fi
-
- if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
- fi
-
- if [ -f config/binary_rootfs/squashfs.sort ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
- cp config/binary_rootfs/squashfs.sort chroot
- fi
-
- # Create image
- Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
-
- # Move image
- ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
- ${LH_ROOT_COMMAND} rm -rf chroot/chroot chroot/squashfs.sort
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/${INITFS}
- fi
-
- # Removing depends
- Remove_package
- ;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_rootfs
Copied: dists/sid/live-helper/helpers/lh_binary_rootfs (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_rootfs)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_rootfs (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_rootfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+# lh_binary_rootfs(1) - build rootfs image
+# 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="build rootfs image"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin building root filesystem image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/binary_chroot
+
+# Checking stage file
+Check_stagefile .stage/binary_rootfs
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Creating directory
+mkdir -p binary/${INITFS}
+
+case "${LIVE_CHROOT_FILESYSTEM}" in
+ ext2)
+ # Checking depends
+ Check_package chroot/usr/bin/genext2fs genext2fs
+
+ # Installing depends
+ Install_package
+
+ # Remove old ext2 image
+ if [ -f binary/${INITFS}/filesystem.ext2 ]
+ then
+ rm -f binary/${INITFS}/filesystem.ext2
+ fi
+
+ DU_DIM="`du -ks chroot | cut -f1`"
+ REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+
+ Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
+
+ # Move image
+ mv chroot/filesystem.ext2 binary/${INITFS}
+ rm -rf chroot/chroot
+
+ # Removing depends
+ Remove_package
+ ;;
+
+ plain)
+ if [ -d binary/${INITFS}/filesystem.dir ]
+ then
+ rm -rf binary/${INITFS}/filesystem.dir
+ fi
+
+ mv chroot/chroot binary/${INITFS}/filesystem.dir
+ ;;
+
+ squashfs)
+ # Checking depends
+ Check_package chroot/usr/sbin/mksquashfs squashfs-tools
+
+ # Installing depends
+ Install_package
+
+ # Remove old squashfs image
+ if [ -f binary/${INITFS}/filesystem.squashfs ]
+ then
+ rm -f binary/${INITFS}/filesystem.squashfs
+ fi
+
+ if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
+ fi
+
+ if [ "${LH_VERBOSE}" = "enabled" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
+ fi
+
+ if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+ fi
+
+ if [ -f config/binary_rootfs/squashfs.sort ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
+ cp config/binary_rootfs/squashfs.sort chroot
+ fi
+
+ # Create image
+ Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+
+ # Move image
+ ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
+ ${LH_ROOT_COMMAND} rm -rf chroot/chroot chroot/squashfs.sort
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/${INITFS}
+ fi
+
+ # Removing depends
+ Remove_package
+ ;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/binary_rootfs
Deleted: dists/sid/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_syslinux 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,517 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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 lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- Echo_warning "skipping binary_syslinux, foreign architecture."
- exit 0
-fi
-
-# Checking user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
- if [ -d ../"${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
- else
- Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
- exit 1
- fi
-fi
-
-# Check local templates
-if [ -d config/templates/syslinux ]
-then
- LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/bin/syslinux syslinux
-
-# 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)
- DESTDIR_LIVE="tftpboot"
- DESTDIR_INSTALL="tftpboot"
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- DESTDIR_LIVE="binary"
- DESTDIR_INSTALL="binary"
- else
- DESTDIR_LIVE="binary/live"
- DESTDIR_INSTALL="binary/install"
- fi
- ;;
-esac
-
-# 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 "${LIVE_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
-
-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
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- else
- LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
-else
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-fi
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- else
- LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
- else
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- else
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
- fi
- done
-fi
-
-# Removing '//'
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
- then
- VMLINUZ_DI="vmlinuz.di"
- INITRD_DI="initrddi.gz"
-
- VMLINUZ_GI="vmlinuz.gi"
- INITRD_GI="initrdgi.gz"
- else
- VMLINUZ_DI="vmlinuz"
- INITRD_DI="initrd.gz"
-
- VMLINUZ_GI="gtk/vmlinuz"
- INITRD_GI="gtk/initrd.gz"
- fi
- else
- VMLINUZ_DI="vmlinuz"
- INITRD_DI="initrd.gz"
-
- VMLINUZ_GI="gtk/vmlinuz"
- INITRD_GI="gtk/initrd.gz"
- fi
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
- fi
-
- LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
- fi
- else
- LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
- fi
-
- LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
- fi
- fi
-fi
-
-LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
- if [ "${LIVE_BINARY_IMAGES}" != "net" ]
- then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- MEMTEST="LABEL memtest\n\tkernel memtest"
- else
- MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
- fi
- else
- MEMTEST="LABEL memtest\n\tkernel memtest"
- fi
-
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-case "${LIVE_BINARY_IMAGES}" in
- 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
- 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
- ;;
-
- 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
- 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
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/syslinux"
- fi
-
- # Copying syslinux
- mkdir -p "${DESTDIR}"
- cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
- cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
- mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
-
- # Copying splash screen
- if [ -f config/binary_syslinux/splash.rle ]
- 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
-
- # Remove unused files
- rm -f "${DESTDIR}"/pxelinux.cfg
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- NUMBER=$(($NUMBER + 1))
-
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
- mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
- sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
- done
- else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
- fi
- fi
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux
Copied: dists/sid/live-helper/helpers/lh_binary_syslinux (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_syslinux)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_syslinux (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_syslinux 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,519 @@
+#!/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 lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ Echo_warning "skipping binary_syslinux, foreign architecture."
+ exit 0
+fi
+
+# Checking user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+ if [ -d ../"${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+ else
+ Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+ exit 1
+ fi
+fi
+
+# Check local templates
+if [ -d config/templates/syslinux ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
+
+# 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)
+ DESTDIR_LIVE="tftpboot"
+ DESTDIR_INSTALL="tftpboot"
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ DESTDIR_LIVE="binary"
+ DESTDIR_INSTALL="binary"
+ else
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
+ fi
+ ;;
+esac
+
+# 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 "${LIVE_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
+
+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
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
+else
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+ LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+fi
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+ for KERNEL in chroot/boot/vmlinuz*
+ do
+ if [ -z "${LINUX}" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
+ else
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
+ fi
+ done
+fi
+
+# Removing '//'
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ VMLINUZ_DI="vmlinuz.di"
+ INITRD_DI="initrddi.gz"
+
+ VMLINUZ_GI="vmlinuz.gi"
+ INITRD_GI="initrdgi.gz"
+ else
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ fi
+ else
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ fi
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+ else
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+ fi
+fi
+
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+ then
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ MEMTEST="LABEL memtest\n\tkernel memtest"
+ else
+ MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
+ fi
+ else
+ MEMTEST="LABEL memtest\n\tkernel memtest"
+ fi
+
+ MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+case "${LIVE_BINARY_IMAGES}" in
+ 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
+ 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
+ ;;
+
+ 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
+ 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
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/syslinux"
+ fi
+
+ # Copying syslinux
+ mkdir -p "${DESTDIR}"
+ cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+ cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+ mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
+
+ # Copying splash screen
+ if [ -f config/binary_syslinux/splash.rle ]
+ 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+
+ # Remove unused files
+ rm -f "${DESTDIR}"/pxelinux.cfg
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ NUMBER=$(($NUMBER + 1))
+
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+ sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
+ done
+ else
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+ fi
+ fi
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux
Deleted: dists/sid/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,155 +0,0 @@
-#!/bin/sh
-
-# lh_binary_usb-hdd(1) - build binary usb-hdd image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building binary usb-hdd image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/chroot_proc
-
-# Checking stage file
-Check_stagefile .stage/binary_usb-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/usr/sbin/mtools mtools
-Check_package chroot/sbin/parted parted
-
-case "${LIVE_BOOTLOADER}" in
- grub)
- Check_package chroot/usr/sbin/grub grub
- ;;
-
- syslinux)
- Check_package chroot/usr/bin/syslinux syslinux
- ;;
-esac
-
-# Installing depends
-Install_package
-
-# Remove old binary
-if [ -f binary.img ]
-then
- rm -f binary.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="`du -ms binary | cut -f1`"
-REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
-FREELO="`${LH_LOSETUP} -f`"
-if [ ! -b chroot/${FREELO} ]
-then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
-fi
-
-echo "!!! The following error/warning messages can be ignored !!!"
-lh_losetup $FREELO binary.img 0
-Chroot "parted -s ${FREELO} mklabel msdos" || true
-Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-Chroot "parted -s ${FREELO} set 1 boot on" || true
-Chroot "parted -s ${FREELO} set 1 lba off" || true
-
-case "${LIVE_BOOTLOADER}" in
- grub)
- #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
-#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
-#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
-#
-#quit
-#EOF
- #rm -f binary/boot/grub/device.map
-
- #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
- ;;
-
- syslinux)
- cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
- ;;
-esac
-
-${LH_LOSETUP} -d ${FREELO}
-
-FREELO="`${LH_LOSETUP} -f`"
-lh_losetup $FREELO binary.img 1
-Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-mkdir -p binary.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
-cp -r binary/* binary.tmp
-${LH_ROOT_COMMAND} umount binary.tmp
-rmdir binary.tmp
-
-if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-then
- Chroot "syslinux ${FREELO}"
-fi
-
-${LH_LOSETUP} -d ${FREELO}
-
-#if [ "${LIVE_BOOTLOADER}" = "grub" ]
-#then
-# FREELO="`${LH_LOSETUP} -f`"
-# lh_losetup $FREELO binary.img 0
-
-# dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
-# dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
-
-# ${LH_LOSETUP} -d ${FREELO}
-#fi
-echo "!!! The above error/warning messages can be ignored !!!"
-
-if [ -n "${MAKEDEV}" ]
-then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
-fi
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_usb-hdd
Copied: dists/sid/live-helper/helpers/lh_binary_usb-hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_usb-hdd)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_usb-hdd (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+# lh_binary_usb-hdd(1) - build binary usb-hdd image
+# 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="build binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary usb-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/chroot_proc
+
+# Checking stage file
+Check_stagefile .stage/binary_usb-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/usr/sbin/mtools mtools
+Check_package chroot/sbin/parted parted
+
+case "${LIVE_BOOTLOADER}" in
+ grub)
+ Check_package chroot/usr/sbin/grub grub
+ ;;
+
+ syslinux)
+ Check_package chroot/usr/bin/syslinux syslinux
+ ;;
+esac
+
+# Installing depends
+Install_package
+
+# Remove old binary
+if [ -f binary.img ]
+then
+ rm -f binary.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms binary | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO binary.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 boot on" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+
+case "${LIVE_BOOTLOADER}" in
+ grub)
+ #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
+#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
+#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
+#
+#quit
+#EOF
+ #rm -f binary/boot/grub/device.map
+
+ #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
+ ;;
+
+ syslinux)
+ cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+ ;;
+esac
+
+${LH_LOSETUP} -d ${FREELO}
+
+FREELO="`${LH_LOSETUP} -f`"
+lh_losetup $FREELO binary.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p binary.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
+cp -r binary/* binary.tmp
+${LH_ROOT_COMMAND} umount binary.tmp
+rmdir binary.tmp
+
+if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+then
+ Chroot "syslinux ${FREELO}"
+fi
+
+${LH_LOSETUP} -d ${FREELO}
+
+#if [ "${LIVE_BOOTLOADER}" = "grub" ]
+#then
+# FREELO="`${LH_LOSETUP} -f`"
+# lh_losetup $FREELO binary.img 0
+
+# dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
+# dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
+
+# ${LH_LOSETUP} -d ${FREELO}
+#fi
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_usb-hdd
Deleted: dists/sid/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_binary_yaboot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,227 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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 lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
-then
- Echo_warning "skipping binary_yaboot, foreign architecture."
- exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
- if [ -d ../"${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
- else
- Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
- exit 1
- fi
-fi
-
-# Checking local templates
-if [ -d config/templates/yaboot ]
-then
- LIVE_TEMPLATES="config/templates"
-fi
-
-# 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="binary/live"
- ;;
-
- net|usb-hdd|hdd)
- Echo_error "not supported, FIXME"
- ;;
-esac
-
-# Temporary check for broken yaboot
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- case "${LIVE_ARCHITECTURE}" in
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
-fi
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# 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 "${LIVE_INITRAMFS}" in
- casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
- ;;
-
- live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
- then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
- fi
- ;;
- esac
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- else
- LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- fi
- else
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- else
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- fi
- fi
- done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- # Copying yaboot
- mkdir -p binary/install
- cp chroot/usr/lib/yaboot/yaboot binary/install
- 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}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/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
-
- # Working arround yaboot 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- NUMBER=$(($NUMBER + 1))
-
- mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
- mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
- sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
- done
- else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
- fi
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot
Copied: dists/sid/live-helper/helpers/lh_binary_yaboot (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_yaboot)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_yaboot (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_yaboot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,229 @@
+#!/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 lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
+then
+ Echo_warning "skipping binary_yaboot, foreign architecture."
+ exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+ if [ -d ../"${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+ else
+ Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+ exit 1
+ fi
+fi
+
+# Checking local templates
+if [ -d config/templates/yaboot ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
+# 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="binary/live"
+ ;;
+
+ net|usb-hdd|hdd)
+ Echo_error "not supported, FIXME"
+ ;;
+esac
+
+# Temporary check for broken yaboot
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ case "${LIVE_ARCHITECTURE}" in
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ ;;
+ esac
+fi
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# 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 "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+ LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz*
+ do
+ if [ -z "${LINUX}" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ else
+ LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ fi
+ else
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ else
+ LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ fi
+ fi
+ done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ # Copying yaboot
+ mkdir -p binary/install
+ cp chroot/usr/lib/yaboot/yaboot binary/install
+ 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}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/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
+
+ # Working arround yaboot 8.3 limitation
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ NUMBER=$(($NUMBER + 1))
+
+ mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
+ mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
+ sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+ done
+ else
+ mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
+ mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
+ sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+ fi
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot
Deleted: dists/sid/live-helper/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_bootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap(1) - bootstrap a Debian system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="bootstrap a Debian system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-# Bootstrapping system
-lh_bootstrap_cdebootstrap ${*}
-lh_bootstrap_debootstrap ${*}
Copied: dists/sid/live-helper/helpers/lh_bootstrap (from rev 1940, dists/trunk/live-helper/helpers/lh_bootstrap)
===================================================================
--- dists/sid/live-helper/helpers/lh_bootstrap (rev 0)
+++ dists/sid/live-helper/helpers/lh_bootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# lh_bootstrap(1) - bootstrap a Debian system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="bootstrap a Debian system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+# Bootstrapping system
+lh_bootstrap_cdebootstrap ${*}
+lh_bootstrap_debootstrap ${*}
Deleted: dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,190 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="bootstrap a Debian system with cdebootstrap(1)"
-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 [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
-then
- exit 0
-fi
-
-Echo_message "Begin bootstrapping system..."
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting cdebootstrap options
-if [ -n "${LIVE_ARCHITECTURE}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_ARCHITECTURE}"
-fi
-
-if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
-fi
-
-if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
-fi
-
-if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-else
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-fi
-
-if [ "${LH_DEBUG}" = "true" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
-fi
-
-if [ "${LH_QUIET}" = "true" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
-fi
-
-if [ "${LH_VERBOSE}" = "true" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ -x "/usr/bin/cdebootstrap" ]
-then
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
- then
- # Restore old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
- done
-
- if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
- then
- if [ -d cache/packages_bootstrap ]
- then
- mkdir -p chroot/var/cache/bootstrap
- cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
- fi
-
- # Executing cdebootstrap (download-only)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Removing old cache
- if [ -d cache/packages_bootstrap ]
- then
- rm -f cache/packages_bootstrap/*.deb
- fi
-
- # Saving new cache
- mkdir -p cache/packages_bootstrap
-
- cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
- fi
-
- # Executing cdebootstrap (regular run)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
- if [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "mini" ]
- then
- Chroot "dpkg -P cdebootstrap-helper-diverts"
- fi
-
- # Deconfiguring cdebootstrap configurations
- rm -f chroot/etc/apt/sources.list
- rm -f chroot/etc/hosts
- rm -f chroot/etc/resolv.conf
-
- # Removing bootstrap cache
- rm -rf chroot/var/cache/bootstrap
-
- # Saving new cache
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ]
- then
- if [ -d cache/stages_bootstrap ]
- then
- rm -rf cache/stages_bootstrap
- fi
-
- mkdir -p cache
-
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
- fi
- fi
- done
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-else
- Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
- exit 1
-fi
Copied: dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap (from rev 1940, dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap)
===================================================================
--- dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap (rev 0)
+++ dists/sid/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,192 @@
+#!/bin/sh
+
+# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
+# 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="bootstrap a Debian system with cdebootstrap(1)"
+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 [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Creating chroot directory
+mkdir -p chroot
+
+# Setting cdebootstrap options
+if [ -n "${LIVE_ARCHITECTURE}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_ARCHITECTURE}"
+fi
+
+if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
+fi
+
+if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
+fi
+
+if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
+else
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+fi
+
+if [ "${LH_DEBUG}" = "true" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
+fi
+
+if [ "${LH_QUIET}" = "true" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
+fi
+
+if [ "${LH_VERBOSE}" = "true" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
+fi
+
+if [ -x "/usr/bin/cdebootstrap" ]
+then
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
+ then
+ # Restore old cache
+ ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+
+ exit 0
+ fi
+ done
+
+ if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+ then
+ if [ -d cache/packages_bootstrap ]
+ then
+ mkdir -p chroot/var/cache/bootstrap
+ cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
+ fi
+
+ # Executing cdebootstrap (download-only)
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Removing old cache
+ if [ -d cache/packages_bootstrap ]
+ then
+ rm -f cache/packages_bootstrap/*.deb
+ fi
+
+ # Saving new cache
+ mkdir -p cache/packages_bootstrap
+
+ cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
+ fi
+
+ # Executing cdebootstrap (regular run)
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
+ if [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "mini" ]
+ then
+ Chroot "dpkg -P cdebootstrap-helper-diverts"
+ fi
+
+ # Deconfiguring cdebootstrap configurations
+ rm -f chroot/etc/apt/sources.list
+ rm -f chroot/etc/hosts
+ rm -f chroot/etc/resolv.conf
+
+ # Removing bootstrap cache
+ rm -rf chroot/var/cache/bootstrap
+
+ # Saving new cache
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ]
+ then
+ if [ -d cache/stages_bootstrap ]
+ then
+ rm -rf cache/stages_bootstrap
+ fi
+
+ mkdir -p cache
+
+ ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
+ fi
+ fi
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+else
+ Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
+ exit 1
+fi
Deleted: dists/sid/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_bootstrap_debootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="bootstrap a Debian system with debootstrap(8)"
-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 [ "${LH_BOOTSTRAP}" != "debootstrap" ]
-then
- exit 0
-fi
-
-Echo_message "Begin bootstrapping system..."
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting debootstrap options
-if [ -n "${LIVE_ARCHITECTURE}" ]
-then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LIVE_ARCHITECTURE}"
-fi
-
-if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
-then
- LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
-fi
-
-if [ "${LH_VERBOSE}" = "true" ]
-then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ -x "/usr/sbin/debootstrap" ]
-then
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
- then
- # Restore old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
- done
-
- if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
- then
- if [ -d cache/packages_bootstrap ]
- then
- mkdir -p chroot/var/cache/apt/archives
- cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
- fi
-
- # Executing debootstrap (download-only)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Removing old cache
- if [ -d cache/packages_bootstrap ]
- then
- rm -f cache/packages_bootstrap/*.deb
- fi
-
- # Saving new cache
- mkdir -p cache/packages_bootstrap
-
- cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
- fi
-
- # Executing debootstrap (regular run)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Removing bootstrap cache
- rm -f chroot/var/cache/apt/archives/*.deb
-
- # Saving new cache
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ]
- then
- if [ -d cache/stages_bootstrap ]
- then
- rm -rf cache/stages_bootstrap
- fi
-
- mkdir -p cache
-
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
- fi
- fi
- done
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-else
- Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
- exit 1
-fi
Copied: dists/sid/live-helper/helpers/lh_bootstrap_debootstrap (from rev 1940, dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap)
===================================================================
--- dists/sid/live-helper/helpers/lh_bootstrap_debootstrap (rev 0)
+++ dists/sid/live-helper/helpers/lh_bootstrap_debootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,159 @@
+#!/bin/sh
+
+# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
+# 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="bootstrap a Debian system with debootstrap(8)"
+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 [ "${LH_BOOTSTRAP}" != "debootstrap" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Creating chroot directory
+mkdir -p chroot
+
+# Setting debootstrap options
+if [ -n "${LIVE_ARCHITECTURE}" ]
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LIVE_ARCHITECTURE}"
+fi
+
+if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
+then
+ LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
+fi
+
+if [ "${LH_VERBOSE}" = "true" ]
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
+fi
+
+if [ -x "/usr/sbin/debootstrap" ]
+then
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
+ then
+ # Restore old cache
+ ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+
+ exit 0
+ fi
+ done
+
+ if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+ then
+ if [ -d cache/packages_bootstrap ]
+ then
+ mkdir -p chroot/var/cache/apt/archives
+ cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
+ fi
+
+ # Executing debootstrap (download-only)
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Removing old cache
+ if [ -d cache/packages_bootstrap ]
+ then
+ rm -f cache/packages_bootstrap/*.deb
+ fi
+
+ # Saving new cache
+ mkdir -p cache/packages_bootstrap
+
+ cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
+ fi
+
+ # Executing debootstrap (regular run)
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Removing bootstrap cache
+ rm -f chroot/var/cache/apt/archives/*.deb
+
+ # Saving new cache
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ]
+ then
+ if [ -d cache/stages_bootstrap ]
+ then
+ rm -rf cache/stages_bootstrap
+ fi
+
+ mkdir -p cache
+
+ ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
+ fi
+ fi
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+else
+ Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
+ exit 1
+fi
Deleted: dists/sid/live-helper/helpers/lh_build
===================================================================
--- dists/trunk/live-helper/helpers/lh_build 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_build 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# lh_build(1) - build a Debian Live system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="build a Debian Live system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Bootstrapping system
-lh_bootstrap ${*}
-
-# Customizing chroot
-lh_chroot ${*}
-
-# Building binary images
-lh_binary ${*}
-
-# Building source images
-lh_source ${*}
Copied: dists/sid/live-helper/helpers/lh_build (from rev 1940, dists/trunk/live-helper/helpers/lh_build)
===================================================================
--- dists/sid/live-helper/helpers/lh_build (rev 0)
+++ dists/sid/live-helper/helpers/lh_build 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# lh_build(1) - build a Debian Live system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="build a Debian Live system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Bootstrapping system
+lh_bootstrap ${*}
+
+# Customizing chroot
+lh_chroot ${*}
+
+# Building binary images
+lh_binary ${*}
+
+# Building source images
+lh_source ${*}
Deleted: dists/sid/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# lh_chroot(1) - customize the Debian system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="customize the Debian system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-# Configuring chroot
-lh_chroot_proc install ${*}
-lh_chroot_sysfs install ${*}
-lh_chroot_debianchroot install ${*}
-lh_chroot_sysvrc install ${*}
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_apt install ${*}
-lh_chroot_sources install ${*}
-lh_chroot_linux-image install ${*}
-
-# Customizing chroot
-lh_chroot_preseed ${*}
-lh_chroot_tasks ${*}
-lh_chroot_packageslists ${*}
-lh_chroot_packages ${*}
-lh_chroot_local-packageslists ${*}
-lh_chroot_local-packages ${*}
-lh_chroot_localization ${*}
-lh_chroot_local-includes ${*}
-lh_chroot_sysvinit ${*}
-lh_chroot_hooks ${*}
-lh_chroot_local-hooks ${*}
-lh_chroot_symlinks ${*}
-lh_chroot_hacks ${*}
-lh_chroot_interactive ${*}
-
-# Deconfiguring chroot
-lh_chroot_linux-image remove ${*}
-lh_chroot_sources remove ${*}
-lh_chroot_apt remove ${*}
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
-lh_chroot_sysvrc remove ${*}
-lh_chroot_debianchroot remove ${*}
-lh_chroot_sysfs remove ${*}
-lh_chroot_proc remove ${*}
Copied: dists/sid/live-helper/helpers/lh_chroot (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# lh_chroot(1) - customize the Debian system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="customize the Debian system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+# Configuring chroot
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_debianchroot install ${*}
+lh_chroot_sysvrc install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_apt install ${*}
+lh_chroot_sources install ${*}
+lh_chroot_linux-image install ${*}
+
+# Customizing chroot
+lh_chroot_preseed ${*}
+lh_chroot_tasks ${*}
+lh_chroot_packageslists ${*}
+lh_chroot_packages ${*}
+lh_chroot_local-packageslists ${*}
+lh_chroot_local-packages ${*}
+lh_chroot_localization ${*}
+lh_chroot_local-includes ${*}
+lh_chroot_sysvinit ${*}
+lh_chroot_hooks ${*}
+lh_chroot_local-hooks ${*}
+lh_chroot_symlinks ${*}
+lh_chroot_hacks ${*}
+lh_chroot_interactive ${*}
+
+# Deconfiguring chroot
+lh_chroot_linux-image remove ${*}
+lh_chroot_sources remove ${*}
+lh_chroot_apt remove ${*}
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysvrc remove ${*}
+lh_chroot_debianchroot remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
Deleted: dists/sid/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_apt 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_apt(1) - manage /etc/apt/apt.conf
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/apt/apt.conf"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/apt/apt.conf"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_apt
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- mkdir -p chroot/etc/apt/apt.conf.d
-
- # Configuring apt ftp proxy
- if [ -n "${LH_APT_FTPPROXY}" ]
- then
- echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
- fi
-
- # Configuring apt http proxy
- if [ -n "${LH_APT_HTTPPROXY}" ]
- then
- echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
- fi
-
- # Configuring apt pdiffs
- case "${LH_APT_PDIFFS}" in
- enabled)
- echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
- ;;
-
- disabled)
- echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
- ;;
- esac
-
- # Configuring apt pipeline
- if [ -n "${LH_APT_PIPELINE}" ]
- then
- echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
- fi
-
- # Configuring apt recommends
- if [ "${LH_APT}" = "aptitude" ]
- then
- case "${LH_APT_RECOMMENDS}" in
- enabled)
- echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
- ;;
-
- disabled)
- echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
- ;;
- esac
- fi
-
- # Configuring apt secure
- case "${LH_APT_SECURE}" in
- enabled)
- echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
- echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
- ;;
-
- disabled)
- echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
- echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
- ;;
- esac
-
- # Creating stage file
- Create_stagefile .stage/chroot_apt
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Deconfiguring aptitude ftp proxy
- rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
-
- # Deconfiguring aptitude http proxy
- rm -f chroot/etc/apt/apt.conf.d/00http-proxy
-
- # Deconfiguring aptitude pdiffs
- rm -f chroot/etc/apt/apt.conf.d/00pdiffs
-
- # Deconfiguring aptitude pipeline
- rm -f chroot/etc/apt/apt.conf.d/00pipeline
-
- # Deconfiguring aptitude recommends
- rm -f chroot/etc/apt/apt.conf.d/00recommends
-
- # Deconfiguring aptitude secure
- rm -f chroot/etc/apt/apt.conf.d/00secure
-
- # Removing stage file
- rm -f .stage/chroot_apt
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_apt (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_apt)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_apt (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_apt 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# lh_chroot_apt(1) - manage /etc/apt/apt.conf
+# 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="manage /etc/apt/apt.conf"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/apt/apt.conf"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_apt
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ mkdir -p chroot/etc/apt/apt.conf.d
+
+ # Configuring apt ftp proxy
+ if [ -n "${LH_APT_FTPPROXY}" ]
+ then
+ echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
+ fi
+
+ # Configuring apt http proxy
+ if [ -n "${LH_APT_HTTPPROXY}" ]
+ then
+ echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
+ fi
+
+ # Configuring apt pdiffs
+ case "${LH_APT_PDIFFS}" in
+ enabled)
+ echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+ ;;
+
+ disabled)
+ echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+ ;;
+ esac
+
+ # Configuring apt pipeline
+ if [ -n "${LH_APT_PIPELINE}" ]
+ then
+ echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+ fi
+
+ # Configuring apt recommends
+ if [ "${LH_APT}" = "aptitude" ]
+ then
+ case "${LH_APT_RECOMMENDS}" in
+ enabled)
+ echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
+ ;;
+
+ disabled)
+ echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
+ ;;
+ esac
+ fi
+
+ # Configuring apt secure
+ case "${LH_APT_SECURE}" in
+ enabled)
+ echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
+ echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
+ ;;
+
+ disabled)
+ echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
+ echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
+ ;;
+ esac
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_apt
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Deconfiguring aptitude ftp proxy
+ rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
+
+ # Deconfiguring aptitude http proxy
+ rm -f chroot/etc/apt/apt.conf.d/00http-proxy
+
+ # Deconfiguring aptitude pdiffs
+ rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+
+ # Deconfiguring aptitude pipeline
+ rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
+ # Deconfiguring aptitude recommends
+ rm -f chroot/etc/apt/apt.conf.d/00recommends
+
+ # Deconfiguring aptitude secure
+ rm -f chroot/etc/apt/apt.conf.d/00secure
+
+ # Removing stage file
+ rm -f .stage/chroot_apt
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_debianchroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/debian_chroot"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/debian_chroot"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_debianchroot
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/debian_chroot ]
- then
- # Save chroot file
- mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig
- fi
-
- # Create chroot file
- echo "live" > chroot/etc/debian_chroot
-
- # Creating stage file
- Create_stagefile .stage/chroot_debianchroot
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/debian_chroot.orig ]
- then
- # Restore chroot file
- mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot
- else
- # Remove chroot file
- rm -f chroot/etc/debian_chroot
- fi
-
- # Removing stage file
- rm -f .stage/chroot_debianchroot
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_debianchroot (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_debianchroot)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_debianchroot (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_debianchroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
+# 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="manage /etc/debian_chroot"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/debian_chroot"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_debianchroot
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/debian_chroot ]
+ then
+ # Save chroot file
+ mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig
+ fi
+
+ # Create chroot file
+ echo "live" > chroot/etc/debian_chroot
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_debianchroot
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/debian_chroot.orig ]
+ then
+ # Restore chroot file
+ mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot
+ else
+ # Remove chroot file
+ rm -f chroot/etc/debian_chroot
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_debianchroot
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_hacks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hacks(1) - execute hacks in chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="execute hacks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing hacks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hacks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing udev mac caching rule
-Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
-
-case "${LIVE_BINARY_IMAGES}" in
- net)
- if [ ! -f chroot/usr/bin/smbmount ]
- then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes smbfs"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes smbfs"
- ;;
- esac
- fi
-
- if [ ! -d chroot/etc/initramfs-tools ]
- then
- mkdir chroot/etc/initramfs-tools
- fi
- if [ ! "`grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf`" ]
- then
- # Configuring initramfs for NFS
-cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
-MODULES=netboot
-BOOT=nfs
-NFSROOT=auto
-EOF
- fi
- ;;
-esac
-
-# Update initramfs
-Chroot "update-initramfs -k all -t -u"
-
-if [ -n "${LH_ROOT_COMMAND}" ]
-then
- ${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/chroot_hacks
Copied: dists/sid/live-helper/helpers/lh_chroot_hacks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_hacks)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_hacks (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_hacks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# lh_chroot_hacks(1) - execute hacks in chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute hacks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing hacks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hacks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing udev mac caching rule
+Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
+
+case "${LIVE_BINARY_IMAGES}" in
+ net)
+ if [ ! -f chroot/usr/bin/smbmount ]
+ then
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes smbfs"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes smbfs"
+ ;;
+ esac
+ fi
+
+ if [ ! -d chroot/etc/initramfs-tools ]
+ then
+ mkdir chroot/etc/initramfs-tools
+ fi
+ if [ ! "`grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf`" ]
+ then
+ # Configuring initramfs for NFS
+cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
+MODULES=netboot
+BOOT=nfs
+NFSROOT=auto
+EOF
+ fi
+ ;;
+esac
+
+# Update initramfs
+Chroot "update-initramfs -k all -t -u"
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+ ${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/chroot_hacks
Deleted: dists/sid/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hooks(1) - execute hooks in chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="execute hooks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing hooks
-for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
-do
- if [ -f ${LH_BASE-:/usr/share/live-helper}/hooks/"${HOOK}" ]
- then
- # Copying hook
- cp ${LH_BASE-:/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
-
- # Making hook executable
- if [ ! -x chroot/root/"${HOOK}" ]
- then
- chmod +x chroot/root/"${HOOK}"
- fi
-
- # Executing hook
- Chroot "/root/${HOOK}"
-
- # Removing hook
- rm -f chroot/root/"${HOOK}"
-
- # Creating stage file
- Create_stagefile .stage/chroot_hooks
- fi
-done
-
-if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
-then
- LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_hooks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_hooks)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_hooks (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# lh_chroot_hooks(1) - execute hooks in chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute hooks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing hooks
+for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+do
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
+ then
+ # Copying hook
+ cp ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
+
+ # Making hook executable
+ if [ ! -x chroot/root/"${HOOK}" ]
+ then
+ chmod +x chroot/root/"${HOOK}"
+ fi
+
+ # Executing hook
+ Chroot "/root/${HOOK}"
+
+ # Removing hook
+ rm -f chroot/root/"${HOOK}"
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_hooks
+ fi
+done
+
+if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
+then
+ LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_hosts 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hosts(1) - manage /etc/hosts
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/hosts"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/hosts"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_hosts
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/hosts ]
- then
- # Save hosts file
- cp chroot/etc/hosts chroot/etc/hosts.orig
- fi
-
- if [ -f /etc/hosts ]
- then
- # Copy hosts file
- cp /etc/hosts chroot/etc/hosts
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_hosts
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/hosts.orig ]
- then
- # Restore hosts file
- mv chroot/etc/hosts.orig chroot/etc/hosts
- else
- # Remove hosts file
- rm -f chroot/etc/hosts
- fi
-
- # Removing stage file
- rm -f .stage/chroot_hosts
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_hosts (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_hosts)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_hosts (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_hosts 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_hosts(1) - manage /etc/hosts
+# 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="manage /etc/hosts"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/hosts"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_hosts
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/hosts ]
+ then
+ # Save hosts file
+ cp chroot/etc/hosts chroot/etc/hosts.orig
+ fi
+
+ if [ -f /etc/hosts ]
+ then
+ # Copy hosts file
+ cp /etc/hosts chroot/etc/hosts
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_hosts
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/hosts.orig ]
+ then
+ # Restore hosts file
+ mv chroot/etc/hosts.orig chroot/etc/hosts
+ else
+ # Remove hosts file
+ rm -f chroot/etc/hosts
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_hosts
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_interactive 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_interactive(1) - make build interactive
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="make build interactive"
-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_INTERACTIVE}" = "disabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin interactive build..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_interactive
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LIVE_INTERACTIVE}" in
- enabled|shell)
- echo "Pausing build: starting interactive shell..."
- Chroot "/bin/bash --login"
- ;;
- x11)
- echo "Pausing build: starting interactive X11..."
- Chroot "startx"
- ;;
- xnest)
- echo "Pausing build: starting interactive Xnest..."
- #Chroot "" # FIXME
- ;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
Copied: dists/sid/live-helper/helpers/lh_chroot_interactive (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_interactive)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_interactive (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_interactive 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_chroot_interactive(1) - make build interactive
+# 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="make build interactive"
+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_INTERACTIVE}" = "disabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin interactive build..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_interactive
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LIVE_INTERACTIVE}" in
+ enabled|shell)
+ echo "Pausing build: starting interactive shell..."
+ Chroot "/bin/bash --login"
+ ;;
+ x11)
+ echo "Pausing build: starting interactive X11..."
+ Chroot "startx"
+ ;;
+ xnest)
+ echo "Pausing build: starting interactive Xnest..."
+ #Chroot "" # FIXME
+ ;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
Deleted: dists/sid/live-helper/helpers/lh_chroot_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linux-image 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/kernel-img.conf"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/kernel-img.conf"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_linux-image
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/kernel-img.conf ]
- then
- # Saving kernel-img.conf
- cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old
- fi
-
- # Configuring kernel-img.conf
-cat >> chroot/etc/kernel-img.conf << EOF
-do_bootloader = No
-do_initrd = Yes
-warn_initrd = No
-EOF
-
- if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
- then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- for PACKAGE in ${LIVE_LINUX_PACKAGES}
- do
- PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}"
- done
- done
- fi
-
- PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
-
- # Installing linux-image, modules and ${LH_INITRAMFS}
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-
- # Creating stage file
- Create_stagefile .stage/chroot_linux-image
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/kernel-img.conf.old ]
- then
- # Restoring kernel-img.conf file
- mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
- else
- # Removing kernel-img.conf file
- rm -f chroot/etc/kernel-img.conf
- fi
-
- # Removing stage file
- rm -f .stage/chroot_linux-image
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_linux-image (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_linux-image)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_linux-image (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
+# 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="manage /etc/kernel-img.conf"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/kernel-img.conf"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_linux-image
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/kernel-img.conf ]
+ then
+ # Saving kernel-img.conf
+ cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old
+ fi
+
+ # Configuring kernel-img.conf
+cat >> chroot/etc/kernel-img.conf << EOF
+do_bootloader = No
+do_initrd = Yes
+warn_initrd = No
+EOF
+
+ if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ for PACKAGE in ${LIVE_LINUX_PACKAGES}
+ do
+ PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}"
+ done
+ done
+ fi
+
+ PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
+
+ # Installing linux-image, modules and ${LH_INITRAMFS}
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes ${PACKAGES}"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes ${PACKAGES}"
+ ;;
+ esac
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_linux-image
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/kernel-img.conf.old ]
+ then
+ # Restoring kernel-img.conf file
+ mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
+ else
+ # Removing kernel-img.conf file
+ rm -f chroot/etc/kernel-img.conf
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_linux-image
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_local-hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-hooks(1) - execute local hooks in chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="execute local hooks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing local hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing local-hooks
-if ls config/chroot_local-hooks/* > /dev/null 2>&1
-then
- for HOOK in config/chroot_local-hooks/*
- do
- # Copying hook
- cp "${HOOK}" chroot/root
-
- # Making hook executable
- if [ ! -x chroot/root/"`basename ${HOOK}`" ]
- then
- chmod +x chroot/root/"`basename ${HOOK}`"
- fi
-
- # Executing hook
- Chroot "/root/`basename ${HOOK}`"
-
- # Removing hook
- rm -f chroot/root/"`basename ${HOOK}`"
- done
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-hooks
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_local-hooks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-hooks)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_local-hooks (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_local-hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# lh_chroot_local-hooks(1) - execute local hooks in chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute local hooks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing local hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing local-hooks
+if ls config/chroot_local-hooks/* > /dev/null 2>&1
+then
+ for HOOK in config/chroot_local-hooks/*
+ do
+ # Copying hook
+ cp "${HOOK}" chroot/root
+
+ # Making hook executable
+ if [ ! -x chroot/root/"`basename ${HOOK}`" ]
+ then
+ chmod +x chroot/root/"`basename ${HOOK}`"
+ fi
+
+ # Executing hook
+ Chroot "/root/`basename ${HOOK}`"
+
+ # Removing hook
+ rm -f chroot/root/"`basename ${HOOK}`"
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-hooks
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-includes(1) - copy local files into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="copy local files into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin copying chroot local includes..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-includes/* > /dev/null 2>&1
-then
- # Copying includes
- cd config/chroot_local-includes
- find . | cpio -dmpu "${OLDPWD}"/chroot
- cd "${OLDPWD}"
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-includes
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_local-includes (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-includes)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_local-includes (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# lh_chroot_local-includes(1) - copy local files into chroot
+# 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 local files into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin copying chroot local includes..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-includes/* > /dev/null 2>&1
+then
+ # Copying includes
+ cd config/chroot_local-includes
+ find . | cpio -dmpu "${OLDPWD}"/chroot
+ cd "${OLDPWD}"
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-includes
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_local-packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_local-packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packages(1) - install local packages into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install local packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing local packages..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-packages/*.deb > /dev/null 2>&1
-then
- # Restoring cache
- Restore_cache cache/packages_local-packages
-
- # Copying packages
- cp config/chroot_local-packages/*.deb chroot/root
-
- # Installing packages
- Chroot "find /root -name *.deb" > chroot/root/local-packages
- Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
-
- # Cleaning dependencies
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install -f --yes"
- ;;
-
- aptitude)
- Chroot "aptitude install -f --assume-yes"
- ;;
- esac
-
- # Removing package files
- rm -f chroot/root/*.deb
- rm -f chroot/root/local-packages
-
- # Saving cache
- Save_cache cache/packages_local-packages
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-packages
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_local-packages (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-packages)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_local-packages (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_local-packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# lh_chroot_local-packages(1) - install local packages into chroot
+# 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 local packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing local packages..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packages/*.deb > /dev/null 2>&1
+then
+ # Restoring cache
+ Restore_cache cache/packages_local-packages
+
+ # Copying packages
+ cp config/chroot_local-packages/*.deb chroot/root
+
+ # Installing packages
+ Chroot "find /root -name *.deb" > chroot/root/local-packages
+ Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
+
+ # Cleaning dependencies
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install -f --yes"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install -f --assume-yes"
+ ;;
+ esac
+
+ # Removing package files
+ rm -f chroot/root/*.deb
+ rm -f chroot/root/local-packages
+
+ # Saving cache
+ Save_cache cache/packages_local-packages
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-packages
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_local-packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packageslists(1) - install local packages lists into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install local packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing local packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-packageslists/* > /dev/null 2>&1
-then
- # Restoring cache
- Restore_cache cache/packages_local-packageslists
-
- for PACKAGESLIST in config/chroot_local-packageslists/*
- do
- # Copying package list
- grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
-
- # Installing package list
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes"
- ;;
-
- aptitude)
- Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes"
- ;;
- esac
-
- # Removing package list
- rm -f chroot/root/"`basename ${PACKAGESLIST}`"
- done
-
- # Saving cache
- Save_cache cache/packages_local-packageslists
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-packageslists
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_local-packageslists (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-packageslists)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_local-packageslists (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_local-packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# lh_chroot_local-packageslists(1) - install local packages lists into chroot
+# 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 local packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing local packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packageslists/* > /dev/null 2>&1
+then
+ # Restoring cache
+ Restore_cache cache/packages_local-packageslists
+
+ for PACKAGESLIST in config/chroot_local-packageslists/*
+ do
+ # Copying package list
+ grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
+
+ # Installing package list
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes"
+ ;;
+
+ aptitude)
+ Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes"
+ ;;
+ esac
+
+ # Removing package list
+ rm -f chroot/root/"`basename ${PACKAGESLIST}`"
+ done
+
+ # Saving cache
+ Save_cache cache/packages_local-packageslists
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-packageslists
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_localization 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,650 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localization(1) - install localization packages into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install localization packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing localization packages..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localization
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting localizations
-if [ -n "${LIVE_LANGUAGE}" ]
-then
- case "${LIVE_LANGUAGE}" in
- af)
- # Afrikaans
- LOCALIZATIONS="iceweasel kde openoffice"
- ;;
-
- as-in)
- # Assamese
- LOCALIZATIONS="openoffice"
- ;;
-
- ar)
- # Arabic
- LOCALIZATIONS="iceweasel kde openoffice"
- ;;
-
- az)
- # Azerbaijani
- LOCALIZATIONS="kde"
- ;;
-
- be)
- # Belarusian
- LOCALIZATIONS="iceape iceweasel openoffice"
-
- # Overrides
- OPENOFFICE="be-by"
- ;;
-
- bg)
- # Bulgarian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- bn)
- # Bengali
- LOCALIZATIONS="kde openoffice"
- ;;
-
- br)
- # Breton
- LOCALIZATIONS="kde openoffice"
- ;;
-
- bs)
- # Bosnian
- LOCALIZATION="kde openoffice"
- ;;
-
- ca)
- # Catalan
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- cs)
- # Czech
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- cy-gb)
- # Welsh
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="cy"
- KOFFICE="cy"
- OPENOFFICE="cy"
- ;;
-
- da)
- # Danish
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- de)
- # German
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- dz-bt)
- # Dzongkha
- LOCALIZATIONS="iceweasel openoffice"
-
- # Overrides
- OPENOFFICE="dz"
- ;;
-
- el)
- # Greek
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- en-gb)
- # English (Great Britain)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="engb"
- KOFFICE="engb"
- ;;
-
- en-za)
- # English (South Africa)
- LOCALIZATIONS="openoffice"
- ;;
-
- eo)
- # Esperanto
- LOCALIZATIONS="kde openoffice"
- ;;
-
- es-ar)
- # Spanish (Argentina)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="es"
- KOFFICE="es"
- OPENOFFICE="es"
- ;;
-
- es-es)
- # Spanish (Spain)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="es"
- KOFFICE="es"
- OPENOFFICE="es"
- ;;
-
- et-ee)
- # Estonian
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="et"
- KOFFICE="et"
- OPENOFFICE="et"
- ;;
-
- eu)
- # Basque
- LOCALIZATIONS="icedove iceweasel kde koffice"
- ;;
-
- fa-ir)
- # Persian
- LOCALIZATIONS="iceweasel kde openoffice"
-
- # Overrides
- KDE="fa"
- OPENOFFICE="fa"
- ;;
-
- fi)
- # Finnish
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- fr)
- # French
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- fur-it)
- # Furlan
- LOCALIZATIONS="iceweasel"
- ;;
-
- fy-nl)
- # Frisian
- LOCALIZATIONS="iceweasel kde"
-
- # Overrides
- KDE="fy"
- ;;
-
- ga-ie)
- # Irish (Ireland)
- LOCALIZATIONS="icedove iceweasel kde openoffice"
-
- # Overrides
- ICEDOVE="ga"
- KDE="ga"
- OPENOFFICE="ga"
- ;;
-
- gl)
- # Galician
- LOCALIZATIONS="kde"
- ;;
-
- gu-in)
- # Gujarati (India)
- LOCALIZATIONS="icedove iceweasel openoffice"
-
- # Overrides
- ICEDOVE="gu"
- ;;
-
- he)
- # Hebrew
- LOCALIZATIONS="iceape icedove iceweasel kde openoffice"
- ;;
-
- hi)
- # Hindi
- LOCALIZATIONS="kde openoffice"
- ;;
-
- hr)
- # Croatian
- LOCALIZATIONS="kde koffice openoffice"
- ;;
-
- hu)
- # Hungarian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- in)
- # Indic
- LOCALIZATIONS="openoffice"
- ;;
-
- is)
- # Icelandic
- LOCALIZATIONS="kde"
- ;;
-
- it)
- # Italian
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- ja)
- # Japanese
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- ka)
- # Georgian
- LOCALIZATIONS="iceweasel openoffice"
- ;;
-
- km)
- # Khmer
- LOCALIZATIONS="kde openoffice"
- ;;
-
- ko)
- # Korean
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- ku)
- # Kurdish
- LOCALIZATIONS="iceweasel openoffice"
- ;;
-
- lo)
- # Lao
- LOCALIZATIONS="openoffice"
- ;;
-
- lt)
- # Lithuanian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- lv)
- # Latvian
- LOCALIZATIONS="kde koffice openoffice"
- ;;
-
- mk)
- # Macedonian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- ml-in)
- # Malayalam
- LOCALIZATIONS="openoffice"
- ;;
-
- mn)
- # Mongolian
- LOCALIZATIONS="iceweasel kde"
- ;;
-
- ms)
- # Malay
- LOCALIZATIONS="kde koffice"
- ;;
-
- nb-no)
- # Bokmaal (Norway)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- ICEDOVE="nb"
- KDE="nb"
- KOFFICE="nb"
- OPENOFFICE="nb"
- ;;
-
- nds)
- # Low Saxon
- LOCALIZATIONS="kde"
- ;;
-
- ne)
- # Nepalese
- LOCALIZATIONS="openoffice"
- ;;
-
- nl)
- # Dutch
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- nn-no)
- # Nynorsk (Norway)
- LOCALIZATIONS="iceweasel kde openoffice"
-
- # Overrides
- KDE="nn"
- OPENOFFICE="nn"
- ;;
-
- nr)
- # Ndebele
- LOCALIZATIONS="openoffice"
- ;;
-
- ns)
- # Northernsotho
- LOCALIZATIONS="openoffice"
- ;;
-
- or-in)
- # Oriya
- LOCALIZATIONS="openoffice"
- ;;
-
- pa-in)
- # Punjabi (India)
- LOCALIZATIONS="icedove iceweasel kde openoffice"
-
- # Overrides
- ICEDOVE="pa"
- KDE="pa"
- ;;
-
- pl)
- # Polish
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- pt-br)
- # Portugese (Brazil)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="ptbr"
- KOFFICE="ptbr"
- ;;
-
- pt-pt)
- # Portugese (Portugal)
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="pt"
- KOFFICE="pt"
- OPENOFFICE="pt"
- ;;
-
- ro)
- # Romanian
- LOCALIZATIONS="iceweasel kde"
- ;;
-
- roa-es-val)
- # Valencian (Spain)
- LOCALIZATIONS="iceweasel"
- ;;
-
- ru)
- # Russian
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- rw)
- # Kinarwanda
- LOCALIZATIONS="kde openoffice"
- ;;
-
- se)
- # Northern Sami
- LOCALIZATIONS="kde"
- ;;
-
- sk)
- # Slovak
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- sl)
- # Slovenian
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- sr-cs)
- # Serbian
- LOCALIZATIONS="kde koffice openoffice"
-
- # Overrides
- KDE="sr"
- KOFFICE="sr"
- ;;
-
- sr-latin)
- # Latin Serbian
- LOCALIZATIONS="kde koffice"
-
- # Overrides
- KDE="srlatin"
- KOFFICE="srlatin"
- ;;
-
- ss)
- # Swazi
- LOCALIZATIONS="kde openoffice"
- ;;
-
- st)
- # Southern_sotho
- LOCALIZATIONS="openoffice"
- ;;
-
- sv-se)
- # Swedish
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- ICEDOVE="sv"
- KDE="sv"
- KOFFICE="sv"
- OPENOFFICE="sv"
- ;;
-
- ta-in)
- # Tamil
- LOCALIZATIONS="kde openoffice"
-
- # Overrides
- KDE="ta"
- ;;
-
- te-in)
- # Telugu
- LOCALIZATIONS="openoffice"
- ;;
-
- tg)
- # Tajik
- LOCALIZATIONS="kde openoffice"
- ;;
-
- th)
- # Thai
- LOCALIZATIONS="openoffice"
- ;;
-
- tn)
- # Tswana
- LOCALIZATIONS="openoffice"
- ;;
-
- tr)
- # Turkish
- LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
- ;;
-
- ts)
- # Tsonga
- LOCALIZATIONS="openoffice"
- ;;
-
- uk-ua)
- # Ukrainian
- LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
-
- # Overrides
- ICEDOVE="uk"
- KDE="uk"
- KDE="uk"
- OPENOFFICE="uk"
- ;;
-
- uz)
- # Uzbek
- LOCALIZATIONS="kde"
- ;;
-
- ve)
- # Venda
- LOCALIZATIONS="openoffice"
- ;;
-
- vi)
- # Vietnamese
- LOCALIZATIONS="openoffice"
- ;;
-
- xh)
- # Xhosa
- LOCALIZATIONS="openoffice"
- ;;
-
- za)
- # South African
- LOCALIZATIONS="openoffice"
- ;;
-
- zh-cn)
- # Chinese (China)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="zhcn"
- KOFFICE="zhcn"
- ;;
-
- zh-tw)
- # Chinese (Taiwan)
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="zhtw"
- KOFFICE="zhtw"
- ;;
-
- zu)
- # Zulu
- LOCALIZATIONS="openoffice"
- ;;
- esac
-
- # Setting languages
- ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
- ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
- ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
- KDE="${KDE:-$LIVE_LANGUAGE}"
- KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
- OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
-
- # Setting packages
- for LOCALIZATION in ${LOCALIZATIONS}
- do
- case "${LOCALZATION}" in
- iceape)
- Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
- ;;
-
- icedove)
- Check_package chroot/usr/bin/icedove icedove-locale-"${ICEDOVE}"
- ;;
-
- iceweasel)
- Check_package chroot/usr/bin/iceweasel iceweasel-l10n-"${ICEWEASEL}"
- ;;
-
- kde)
- Check_package chroot/usr/bin/kstart kde-i18n-"${KDE}"
- ;;
-
- koffice)
- Check_package chroot/usr/bin/usr/bin/koconverter koffice-i18n-"${KOFFICE}"
- ;;
-
- openoffice)
- Check_package chroot/usr/bin/ooffice openoffice.org-l10n-"${OPENOFFICE}"
- ;;
- esac
- done
-
- # Restoring cache
- Restore_cache cache/packages_localization
-
- # Installing packages
- Install_package
-
- # Saving cache
- Save_cache cache/packages_localization
-
- # Creating stage file
- Create_stagefile .stage/chroot_localization
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_localization (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_localization)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_localization (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_localization 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,652 @@
+#!/bin/sh
+
+# lh_chroot_localization(1) - install localization packages into chroot
+# 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 localization packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing localization packages..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_localization
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting localizations
+if [ -n "${LIVE_LANGUAGE}" ]
+then
+ case "${LIVE_LANGUAGE}" in
+ af)
+ # Afrikaans
+ LOCALIZATIONS="iceweasel kde openoffice"
+ ;;
+
+ as-in)
+ # Assamese
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ ar)
+ # Arabic
+ LOCALIZATIONS="iceweasel kde openoffice"
+ ;;
+
+ az)
+ # Azerbaijani
+ LOCALIZATIONS="kde"
+ ;;
+
+ be)
+ # Belarusian
+ LOCALIZATIONS="iceape iceweasel openoffice"
+
+ # Overrides
+ OPENOFFICE="be-by"
+ ;;
+
+ bg)
+ # Bulgarian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ bn)
+ # Bengali
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ br)
+ # Breton
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ bs)
+ # Bosnian
+ LOCALIZATION="kde openoffice"
+ ;;
+
+ ca)
+ # Catalan
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ cs)
+ # Czech
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ cy-gb)
+ # Welsh
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="cy"
+ KOFFICE="cy"
+ OPENOFFICE="cy"
+ ;;
+
+ da)
+ # Danish
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ de)
+ # German
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ dz-bt)
+ # Dzongkha
+ LOCALIZATIONS="iceweasel openoffice"
+
+ # Overrides
+ OPENOFFICE="dz"
+ ;;
+
+ el)
+ # Greek
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ en-gb)
+ # English (Great Britain)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="engb"
+ KOFFICE="engb"
+ ;;
+
+ en-za)
+ # English (South Africa)
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ eo)
+ # Esperanto
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ es-ar)
+ # Spanish (Argentina)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="es"
+ KOFFICE="es"
+ OPENOFFICE="es"
+ ;;
+
+ es-es)
+ # Spanish (Spain)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="es"
+ KOFFICE="es"
+ OPENOFFICE="es"
+ ;;
+
+ et-ee)
+ # Estonian
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="et"
+ KOFFICE="et"
+ OPENOFFICE="et"
+ ;;
+
+ eu)
+ # Basque
+ LOCALIZATIONS="icedove iceweasel kde koffice"
+ ;;
+
+ fa-ir)
+ # Persian
+ LOCALIZATIONS="iceweasel kde openoffice"
+
+ # Overrides
+ KDE="fa"
+ OPENOFFICE="fa"
+ ;;
+
+ fi)
+ # Finnish
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ fr)
+ # French
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ fur-it)
+ # Furlan
+ LOCALIZATIONS="iceweasel"
+ ;;
+
+ fy-nl)
+ # Frisian
+ LOCALIZATIONS="iceweasel kde"
+
+ # Overrides
+ KDE="fy"
+ ;;
+
+ ga-ie)
+ # Irish (Ireland)
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+
+ # Overrides
+ ICEDOVE="ga"
+ KDE="ga"
+ OPENOFFICE="ga"
+ ;;
+
+ gl)
+ # Galician
+ LOCALIZATIONS="kde"
+ ;;
+
+ gu-in)
+ # Gujarati (India)
+ LOCALIZATIONS="icedove iceweasel openoffice"
+
+ # Overrides
+ ICEDOVE="gu"
+ ;;
+
+ he)
+ # Hebrew
+ LOCALIZATIONS="iceape icedove iceweasel kde openoffice"
+ ;;
+
+ hi)
+ # Hindi
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ hr)
+ # Croatian
+ LOCALIZATIONS="kde koffice openoffice"
+ ;;
+
+ hu)
+ # Hungarian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ in)
+ # Indic
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ is)
+ # Icelandic
+ LOCALIZATIONS="kde"
+ ;;
+
+ it)
+ # Italian
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ ja)
+ # Japanese
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ ka)
+ # Georgian
+ LOCALIZATIONS="iceweasel openoffice"
+ ;;
+
+ km)
+ # Khmer
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ ko)
+ # Korean
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ ku)
+ # Kurdish
+ LOCALIZATIONS="iceweasel openoffice"
+ ;;
+
+ lo)
+ # Lao
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ lt)
+ # Lithuanian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ lv)
+ # Latvian
+ LOCALIZATIONS="kde koffice openoffice"
+ ;;
+
+ mk)
+ # Macedonian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ ml-in)
+ # Malayalam
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ mn)
+ # Mongolian
+ LOCALIZATIONS="iceweasel kde"
+ ;;
+
+ ms)
+ # Malay
+ LOCALIZATIONS="kde koffice"
+ ;;
+
+ nb-no)
+ # Bokmaal (Norway)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ ICEDOVE="nb"
+ KDE="nb"
+ KOFFICE="nb"
+ OPENOFFICE="nb"
+ ;;
+
+ nds)
+ # Low Saxon
+ LOCALIZATIONS="kde"
+ ;;
+
+ ne)
+ # Nepalese
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ nl)
+ # Dutch
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ nn-no)
+ # Nynorsk (Norway)
+ LOCALIZATIONS="iceweasel kde openoffice"
+
+ # Overrides
+ KDE="nn"
+ OPENOFFICE="nn"
+ ;;
+
+ nr)
+ # Ndebele
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ ns)
+ # Northernsotho
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ or-in)
+ # Oriya
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ pa-in)
+ # Punjabi (India)
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+
+ # Overrides
+ ICEDOVE="pa"
+ KDE="pa"
+ ;;
+
+ pl)
+ # Polish
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ pt-br)
+ # Portugese (Brazil)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="ptbr"
+ KOFFICE="ptbr"
+ ;;
+
+ pt-pt)
+ # Portugese (Portugal)
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="pt"
+ KOFFICE="pt"
+ OPENOFFICE="pt"
+ ;;
+
+ ro)
+ # Romanian
+ LOCALIZATIONS="iceweasel kde"
+ ;;
+
+ roa-es-val)
+ # Valencian (Spain)
+ LOCALIZATIONS="iceweasel"
+ ;;
+
+ ru)
+ # Russian
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ rw)
+ # Kinarwanda
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ se)
+ # Northern Sami
+ LOCALIZATIONS="kde"
+ ;;
+
+ sk)
+ # Slovak
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ sl)
+ # Slovenian
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ sr-cs)
+ # Serbian
+ LOCALIZATIONS="kde koffice openoffice"
+
+ # Overrides
+ KDE="sr"
+ KOFFICE="sr"
+ ;;
+
+ sr-latin)
+ # Latin Serbian
+ LOCALIZATIONS="kde koffice"
+
+ # Overrides
+ KDE="srlatin"
+ KOFFICE="srlatin"
+ ;;
+
+ ss)
+ # Swazi
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ st)
+ # Southern_sotho
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ sv-se)
+ # Swedish
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ ICEDOVE="sv"
+ KDE="sv"
+ KOFFICE="sv"
+ OPENOFFICE="sv"
+ ;;
+
+ ta-in)
+ # Tamil
+ LOCALIZATIONS="kde openoffice"
+
+ # Overrides
+ KDE="ta"
+ ;;
+
+ te-in)
+ # Telugu
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ tg)
+ # Tajik
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ th)
+ # Thai
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ tn)
+ # Tswana
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ tr)
+ # Turkish
+ LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
+ ;;
+
+ ts)
+ # Tsonga
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ uk-ua)
+ # Ukrainian
+ LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
+
+ # Overrides
+ ICEDOVE="uk"
+ KDE="uk"
+ KDE="uk"
+ OPENOFFICE="uk"
+ ;;
+
+ uz)
+ # Uzbek
+ LOCALIZATIONS="kde"
+ ;;
+
+ ve)
+ # Venda
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ vi)
+ # Vietnamese
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ xh)
+ # Xhosa
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ za)
+ # South African
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ zh-cn)
+ # Chinese (China)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="zhcn"
+ KOFFICE="zhcn"
+ ;;
+
+ zh-tw)
+ # Chinese (Taiwan)
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="zhtw"
+ KOFFICE="zhtw"
+ ;;
+
+ zu)
+ # Zulu
+ LOCALIZATIONS="openoffice"
+ ;;
+ esac
+
+ # Setting languages
+ ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
+ ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
+ ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
+ KDE="${KDE:-$LIVE_LANGUAGE}"
+ KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
+ OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
+
+ # Setting packages
+ for LOCALIZATION in ${LOCALIZATIONS}
+ do
+ case "${LOCALZATION}" in
+ iceape)
+ Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
+ ;;
+
+ icedove)
+ Check_package chroot/usr/bin/icedove icedove-locale-"${ICEDOVE}"
+ ;;
+
+ iceweasel)
+ Check_package chroot/usr/bin/iceweasel iceweasel-l10n-"${ICEWEASEL}"
+ ;;
+
+ kde)
+ Check_package chroot/usr/bin/kstart kde-i18n-"${KDE}"
+ ;;
+
+ koffice)
+ Check_package chroot/usr/bin/usr/bin/koconverter koffice-i18n-"${KOFFICE}"
+ ;;
+
+ openoffice)
+ Check_package chroot/usr/bin/ooffice openoffice.org-l10n-"${OPENOFFICE}"
+ ;;
+ esac
+ done
+
+ # Restoring cache
+ Restore_cache cache/packages_localization
+
+ # Installing packages
+ Install_package
+
+ # Saving cache
+ Save_cache cache/packages_localization
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_localization
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_packages(1) - install packages into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing packages..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
-then
- # Restoring cache
- Restore_cache cache/packages_packages
-
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${LIVE_PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${LIVE_PACKAGES}"
- ;;
- esac
-
- # Saving cache
- Save_cache cache/packages_packages
-
- # Creating stage file
- Create_stagefile .stage/chroot_packages
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_packages (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_packages)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_packages (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_chroot_packages(1) - install packages into chroot
+# 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 packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing packages..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
+then
+ # Restoring cache
+ Restore_cache cache/packages_packages
+
+ # Installing packages
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes ${LIVE_PACKAGES}"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes ${LIVE_PACKAGES}"
+ ;;
+ esac
+
+ # Saving cache
+ Save_cache cache/packages_packages
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_packages
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_packageslists(1) - install packages lists into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install packages lists into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
-then
- # Restoring cache
- Restore_cache cache/packages_packageslists
-
- for LIST in ${LIVE_PACKAGES_LISTS}
- do
- if [ -f ${LH_BASE-:/usr/share/live-helper}/lists/"${LIST}" ]
- then
- # Copying package list
- grep -v "^#" ${LH_BASE-:/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
-
- # Installing package list
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "xargs --arg-file=/root/${LIST} apt-get install --yes"
- ;;
-
- aptitude)
- Chroot "xargs --arg-file=/root/${LIST} aptitude install --assume-yes"
- ;;
- esac
-
- # Removing package list
- rm -f chroot/root/"${LIST}"
- fi
- done
-
- # Saving cache
- Save_cache cache/packages_packageslists
-
- # Creating stage file
- Create_stagefile .stage/chroot_packageslists
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_packageslists (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_packageslists)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_packageslists (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# lh_chroot_packageslists(1) - install packages lists into chroot
+# 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 packages lists into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
+then
+ # Restoring cache
+ Restore_cache cache/packages_packageslists
+
+ for LIST in ${LIVE_PACKAGES_LISTS}
+ do
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
+ then
+ # Copying package list
+ grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
+
+ # Installing package list
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "xargs --arg-file=/root/${LIST} apt-get install --yes"
+ ;;
+
+ aptitude)
+ Chroot "xargs --arg-file=/root/${LIST} aptitude install --assume-yes"
+ ;;
+ esac
+
+ # Removing package list
+ rm -f chroot/root/"${LIST}"
+ fi
+ done
+
+ # Saving cache
+ Save_cache cache/packages_packageslists
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_packageslists
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_preseed 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_preseed(1) - mount /proc
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="execute preseed in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing preseed..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_preseed
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_PRESEED}" ]
-then
- if [ -f "${LIVE_PRESEED}" ]
- then
- # Check dependency
- Check_package chroot/usr/bin/debconf-set-selections debconf
-
- # Install dependency
- Install_package
-
- # Copying preseed
- cp "${LIVE_PRESEED}" chroot/root/preseed
-
- Chroot "debconf-set-selections /root/preseed"
-
- # Removing preseed file
- rm -f chroot/root/preseed
-
- # Remove dependency
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/chroot_preseed
- fi
-else
- Echo_error "'${LIVE_PRESEED}' file doesn't exists."
- exit 1
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_preseed (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_preseed)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_preseed (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_preseed 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# lh_chroot_preseed(1) - mount /proc
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute preseed in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing preseed..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PRESEED}" ]
+then
+ if [ -f "${LIVE_PRESEED}" ]
+ then
+ # Check dependency
+ Check_package chroot/usr/bin/debconf-set-selections debconf
+
+ # Install dependency
+ Install_package
+
+ # Copying preseed
+ cp "${LIVE_PRESEED}" chroot/root/preseed
+
+ Chroot "debconf-set-selections /root/preseed"
+
+ # Removing preseed file
+ rm -f chroot/root/preseed
+
+ # Remove dependency
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_preseed
+ fi
+else
+ Echo_error "'${LIVE_PRESEED}' file doesn't exists."
+ exit 1
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_proc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_proc(1) - mount /proc
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="mount /proc"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin mounting /proc..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_proc
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Creating mountpoint
- mkdir -p chroot/proc
-
- # Mounting /proc
- ${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
-
- # Creating stage file
- Create_stagefile .stage/chroot_proc
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Workaround binfmt-support /proc locking
- if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
- then
- ${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
- fi
-
- # Unmounting /proc
- #fuser -km chroot/proc
- ${LH_ROOT_COMMAND} umount chroot/proc > /dev/null 2>&1
-
- # Removing stage file
- rm -f .stage/chroot_proc
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_proc (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_proc)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_proc (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_proc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# lh_chroot_proc(1) - mount /proc
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="mount /proc"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin mounting /proc..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_proc
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Creating mountpoint
+ mkdir -p chroot/proc
+
+ # Mounting /proc
+ ${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_proc
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Workaround binfmt-support /proc locking
+ if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
+ then
+ ${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
+ fi
+
+ # Unmounting /proc
+ #fuser -km chroot/proc
+ ${LH_ROOT_COMMAND} umount chroot/proc > /dev/null 2>&1
+
+ # Removing stage file
+ rm -f .stage/chroot_proc
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_resolv 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_resolv(1) - manage /etc/resolv.conf
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/resolv.conf"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/resolv.conf"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_resolv
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/resolv.conf ]
- then
- # Save resolv file
- cp chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
- fi
-
- if [ -f /etc/resolv.conf ]
- then
- # Copy resolv file
- cp /etc/resolv.conf chroot/etc/resolv.conf
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_resolv
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/resolv.conf.orig ]
- then
- # Restore resolv file
- mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
- else
- # Remove resolv file
- rm -f chroot/etc/resolv.conf
- fi
-
- # Removing stage file
- rm -f .stage/chroot_resolv
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_resolv (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_resolv)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_resolv (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_resolv 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_resolv(1) - manage /etc/resolv.conf
+# 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="manage /etc/resolv.conf"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/resolv.conf"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_resolv
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/resolv.conf ]
+ then
+ # Save resolv file
+ cp chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+ fi
+
+ if [ -f /etc/resolv.conf ]
+ then
+ # Copy resolv file
+ cp /etc/resolv.conf chroot/etc/resolv.conf
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_resolv
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/resolv.conf.orig ]
+ then
+ # Restore resolv file
+ mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
+ else
+ # Remove resolv file
+ rm -f chroot/etc/resolv.conf
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_resolv
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_sources 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,307 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sources(1) - manage /etc/apt/sources.list
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/apt/sources.list"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/apt/sources.list"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_sources
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Configure custom sources.list
- echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
-
- if [ "${LIVE_SECURITY}" = "enabled" ]
- then
- case "${LH_MODE}" in
- debian)
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- ;;
-
- ubuntu)
- echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- ;;
- esac
- fi
-
- # Check local sources.list
- if ls config/chroot_sources/*.bootstrap > /dev/null 2>&1
- then
- echo "" >> chroot/etc/apt/sources.list
- echo "# Custom repositories" >> chroot/etc/apt/sources.list
-
- for FILE in config/chroot_sources/*.bootstrap
- do
- cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
- done
- fi
-
- # Update indices from cache
- if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
- then
- if ls cache/indices_bootstrap/secring.gpg* > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
- fi
-
- if ls cache/indices_bootstrap/trusted.gpg* > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
- fi
-
- if [ -f cache/indices_bootstrap/pkgcache.bin ]
- then
- cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
- fi
-
- if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
- then
- cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
- fi
-
- if ls cache/indices_bootstrap/*_Packages > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
- fi
-
- if ls cache/indices_bootstrap/*_Sources > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
- fi
-
- if ls cache/indices_bootstrap/*_Release* > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
- fi
-
- if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
- then
- Chroot "apt-get install --yes --force-yes aptitude"
- fi
- else # Get fresh indices
- # Check local gpg keys
- if ls config/chroot_sources/*.bootstrap.gpg > /dev/null 2>&1
- then
- for FILE in config/chroot_sources/*.bootstrap.gpg
- do
- cp ${FILE} chroot/root
- Chroot "apt-key add /root/`basename ${FILE}`"
- rm -f chroot/root/`basename ${FILE}`
- done
- fi
-
- # Check local keyring packages
- if ls config/chroot_sources/*.deb > /dev/null 2>&1
- then
- for PACKAGE in config/chroot_sources/*.deb
- do
- cp ${PACKAGE} chroot/root
- Chroot "dpkg -i `basename ${PACKAGE}`"
- rm -f chroot/root/`basename ${PACKAGE}`
- done
- fi
-
- # Installing aptitude
- if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ]
- then
- Chroot "apt-get update"
- elif [ "${LH_APT}" = "aptitude" ]
- then
- if [ ! -x /usr/bin/aptitude ]
- then
- Chroot "apt-get update"
- Chroot "apt-get install --yes --force-yes aptitude"
- fi
-
- Chroot "aptitude update"
- fi
-
- # Installing keyring packages
- if [ -n "${LIVE_KEYRING_PACKAGES}" ]
- then
- Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}"
- Chroot "apt-get update"
- fi
-
- if [ "${LH_CACHE_INDICES}" = "enabled" ]
- then
- mkdir -p cache/indices_bootstrap
-
- cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
- cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
-
- cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
- cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
-
- cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
- cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
- cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap
- fi
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_sources
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Configure generic indices
- if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
- then
- # Don't do anything if it's not required
- if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
- [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
- then
- exit 0
- fi
-
- # Cleaning apt list cache
- rm -rf chroot/var/lib/apt/lists
- mkdir -p chroot/var/lib/apt/lists/partial
-
- echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
-
- if [ "${LIVE_SECURITY}" = "enabled" ]
- then
- case "${LH_MODE}" in
- debian)
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- ;;
-
- ubuntu)
- echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- ;;
- esac
- fi
-
- # Check local sources.list
- if ls config/chroot_sources/*.binary > /dev/null 2>&1
- then
- echo "" >> chroot/etc/apt/sources.list
- echo "# Custom repositories" >> chroot/etc/apt/sources.list
-
- for FILE in config/chroot_sources/*.binary
- do
- cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
- done
- fi
-
- # Check local gpg keys
- if ls config/chroot_sources/*.binary.gpg > /dev/null 2>&1
- then
- for FILE in config/chroot_sources/*.binary.gpg
- do
- cp ${FILE} chroot/root
- Chroot "apt-key add /root/`basename ${FILE}`"
- rm -f chroot/root/`basename ${FILE}`
- done
- fi
-
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get update"
- ;;
-
- aptitude)
- Chroot "aptitude update"
- ;;
- esac
- fi
-
- # Cleaning apt packages cache
- rm -rf chroot/var/cache/apt
- mkdir -p chroot/var/cache/apt/archives/partial
-
- # Removing old files
- rm -f chroot/var/lib/dpkg/available-old
- rm -f chroot/var/lib/dpkg/diversions-old
- rm -f chroot/var/lib/dpkg/statoverride-old
- rm -f chroot/var/lib/dpkg/status-old
-
- # Removing stage file
- rm -f .stage/chroot_sources
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_sources (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sources)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_sources (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_sources 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,309 @@
+#!/bin/sh
+
+# lh_chroot_sources(1) - manage /etc/apt/sources.list
+# 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="manage /etc/apt/sources.list"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/apt/sources.list"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_sources
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Configure custom sources.list
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+
+ if [ "${LIVE_SECURITY}" = "enabled" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
+ esac
+ fi
+
+ # Check local sources.list
+ if ls config/chroot_sources/*.bootstrap > /dev/null 2>&1
+ then
+ echo "" >> chroot/etc/apt/sources.list
+ echo "# Custom repositories" >> chroot/etc/apt/sources.list
+
+ for FILE in config/chroot_sources/*.bootstrap
+ do
+ cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
+ done
+ fi
+
+ # Update indices from cache
+ if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
+ then
+ if ls cache/indices_bootstrap/secring.gpg* > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
+ fi
+
+ if ls cache/indices_bootstrap/trusted.gpg* > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
+ fi
+
+ if [ -f cache/indices_bootstrap/pkgcache.bin ]
+ then
+ cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
+ fi
+
+ if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
+ then
+ cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
+ fi
+
+ if ls cache/indices_bootstrap/*_Packages > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
+ fi
+
+ if ls cache/indices_bootstrap/*_Sources > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
+ fi
+
+ if ls cache/indices_bootstrap/*_Release* > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
+ fi
+
+ if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
+ then
+ Chroot "apt-get install --yes --force-yes aptitude"
+ fi
+ else # Get fresh indices
+ # Check local gpg keys
+ if ls config/chroot_sources/*.bootstrap.gpg > /dev/null 2>&1
+ then
+ for FILE in config/chroot_sources/*.bootstrap.gpg
+ do
+ cp ${FILE} chroot/root
+ Chroot "apt-key add /root/`basename ${FILE}`"
+ rm -f chroot/root/`basename ${FILE}`
+ done
+ fi
+
+ # Check local keyring packages
+ if ls config/chroot_sources/*.deb > /dev/null 2>&1
+ then
+ for PACKAGE in config/chroot_sources/*.deb
+ do
+ cp ${PACKAGE} chroot/root
+ Chroot "dpkg -i `basename ${PACKAGE}`"
+ rm -f chroot/root/`basename ${PACKAGE}`
+ done
+ fi
+
+ # Installing aptitude
+ if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ]
+ then
+ Chroot "apt-get update"
+ elif [ "${LH_APT}" = "aptitude" ]
+ then
+ if [ ! -x /usr/bin/aptitude ]
+ then
+ Chroot "apt-get update"
+ Chroot "apt-get install --yes --force-yes aptitude"
+ fi
+
+ Chroot "aptitude update"
+ fi
+
+ # Installing keyring packages
+ if [ -n "${LIVE_KEYRING_PACKAGES}" ]
+ then
+ Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}"
+ Chroot "apt-get update"
+ fi
+
+ if [ "${LH_CACHE_INDICES}" = "enabled" ]
+ then
+ mkdir -p cache/indices_bootstrap
+
+ cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
+ cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
+
+ cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
+ cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
+
+ cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
+ cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
+ cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap
+ fi
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sources
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Configure generic indices
+ if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
+ then
+ # Don't do anything if it's not required
+ if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
+ [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
+ then
+ exit 0
+ fi
+
+ # Cleaning apt list cache
+ rm -rf chroot/var/lib/apt/lists
+ mkdir -p chroot/var/lib/apt/lists/partial
+
+ echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+
+ if [ "${LIVE_SECURITY}" = "enabled" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
+ esac
+ fi
+
+ # Check local sources.list
+ if ls config/chroot_sources/*.binary > /dev/null 2>&1
+ then
+ echo "" >> chroot/etc/apt/sources.list
+ echo "# Custom repositories" >> chroot/etc/apt/sources.list
+
+ for FILE in config/chroot_sources/*.binary
+ do
+ cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
+ done
+ fi
+
+ # Check local gpg keys
+ if ls config/chroot_sources/*.binary.gpg > /dev/null 2>&1
+ then
+ for FILE in config/chroot_sources/*.binary.gpg
+ do
+ cp ${FILE} chroot/root
+ Chroot "apt-key add /root/`basename ${FILE}`"
+ rm -f chroot/root/`basename ${FILE}`
+ done
+ fi
+
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get update"
+ ;;
+
+ aptitude)
+ Chroot "aptitude update"
+ ;;
+ esac
+ fi
+
+ # Cleaning apt packages cache
+ rm -rf chroot/var/cache/apt
+ mkdir -p chroot/var/cache/apt/archives/partial
+
+ # Removing old files
+ rm -f chroot/var/lib/dpkg/available-old
+ rm -f chroot/var/lib/dpkg/diversions-old
+ rm -f chroot/var/lib/dpkg/statoverride-old
+ rm -f chroot/var/lib/dpkg/status-old
+
+ # Removing stage file
+ rm -f .stage/chroot_sources
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_symlinks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_symlinks(1) - convert symlinks
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="convert symlinks"
-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_SYMLINKS}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin converting symlinks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_symlinks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/symlinks symlinks
-
-# Installing depends
-Install_package
-
-# Converting symlinks
-Chroot "symlinks -c -r -s /"
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
Copied: dists/sid/live-helper/helpers/lh_chroot_symlinks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_symlinks)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_symlinks (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_symlinks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# lh_chroot_symlinks(1) - convert symlinks
+# 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="convert symlinks"
+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_SYMLINKS}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin converting symlinks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_symlinks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/symlinks symlinks
+
+# Installing depends
+Install_package
+
+# Converting symlinks
+Chroot "symlinks -c -r -s /"
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
Deleted: dists/sid/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_sysfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysfs(1) - mount /sys
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="mount /sys"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin mounting /sys..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_sysfs
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Create mountpoint
- mkdir -p chroot/sys
-
- # Mounting /sys
- ${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
-
- # Creating stage file
- Create_stagefile .stage/chroot_sysfs
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Unmounting /sys
- #fuser -km chroot/sys
- ${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
-
- # Removing stage file
- rm -f .stage/chroot_sysfs
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_sysfs (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sysfs)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_sysfs (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_sysfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# lh_chroot_sysfs(1) - mount /sys
+# 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="mount /sys"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin mounting /sys..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_sysfs
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Create mountpoint
+ mkdir -p chroot/sys
+
+ # Mounting /sys
+ ${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sysfs
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Unmounting /sys
+ #fuser -km chroot/sys
+ ${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
+
+ # Removing stage file
+ rm -f .stage/chroot_sysfs
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_sysvinit 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysvinit(1) - configure sysvinit
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="configure sysvinit"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring package sysvinit"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_sysvinit
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_SYSVINIT}" = "enabled" ]
-then
- # Disable all
- for FILE in chroot/etc/init.d/*
- do
- Chroot "update-rc.d -f `basename ${FILE}` remove"
- done
-
- # Re-enable all required (taken from -f standard chroot)
- for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
- do
- if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
- then
- # Re-configure if existing
- Chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
- fi
- done
-
- # Creating stage file
- Create_stagefile .stage/chroot_sysvinit
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_sysvinit (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sysvinit)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_sysvinit (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_sysvinit 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# lh_chroot_sysvinit(1) - configure sysvinit
+# 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="configure sysvinit"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring package sysvinit"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_sysvinit
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_SYSVINIT}" = "enabled" ]
+then
+ # Disable all
+ for FILE in chroot/etc/init.d/*
+ do
+ Chroot "update-rc.d -f `basename ${FILE}` remove"
+ done
+
+ # Re-enable all required (taken from -f standard chroot)
+ for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
+ do
+ if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
+ then
+ # Re-configure if existing
+ Chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
+ fi
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sysvinit
+fi
Deleted: dists/sid/live-helper/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_sysvrc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysvrc(1) - manage /usr/sbin/policy-rc.d
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /usr/sbin/policy-rc.d"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /usr/sbin/policy-rc.d"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_sysvrc
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/usr/sbin/policy-rc.d ]
- then
- # Save policy-rc.d file
- mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
- fi
-
- # Create policy-rc.d file
-cat > chroot/usr/sbin/policy-rc.d << EOF
-#!/bin/sh
-
-echo
-echo "Warning: invoke-rc.d policy in action. Skiping daemon starting"
-
-exit 101
-EOF
-
- chmod 0755 chroot/usr/sbin/policy-rc.d
-
- # Creating stage file
- Create_stagefile .stage/chroot_sysvrc
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/usr/sbin/policy-rc.d.orig ]
- then
- # Restore policy-rc.d file
- mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
- else
- # Remove policy-rc.d file
- rm -f chroot/usr/sbin/policy-rc.d
- fi
-
- # Removing stage file
- rm -f .stage/chroot_sysvrc
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_chroot_sysvrc (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sysvrc)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_sysvrc (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_sysvrc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# lh_chroot_sysvrc(1) - manage /usr/sbin/policy-rc.d
+# 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="manage /usr/sbin/policy-rc.d"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /usr/sbin/policy-rc.d"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_sysvrc
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/usr/sbin/policy-rc.d ]
+ then
+ # Save policy-rc.d file
+ mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
+ fi
+
+ # Create policy-rc.d file
+cat > chroot/usr/sbin/policy-rc.d << EOF
+#!/bin/sh
+
+echo
+echo "Warning: invoke-rc.d policy in action. Skiping daemon starting"
+
+exit 101
+EOF
+
+ chmod 0755 chroot/usr/sbin/policy-rc.d
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sysvrc
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/usr/sbin/policy-rc.d.orig ]
+ then
+ # Restore policy-rc.d file
+ mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
+ else
+ # Remove policy-rc.d file
+ rm -f chroot/usr/sbin/policy-rc.d
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_sysvrc
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_chroot_tasks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_tasks(1) - install tasks into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install tasks into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing tasks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_tasks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
-then
- # Restoring cache
- Restore_cache cache/packages_tasks
-
- # Checking depends
- case "${LH_TASKSEL}" in
- aptitude)
- Check_package chroot/usr/bin/aptitude aptitude
- ;;
-
- tasksel)
- Check_package chroot/usr/bin/tasksel tasksel
- ;;
- esac
-
- # Installing depends
- Install_package
-
- # Installing tasks
- case "${LH_TASKSEL}" in
- aptitude)
- Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
- ;;
-
- tasksel)
- for TASK in ${LIVE_TASKS}
- do
- Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
- done
- ;;
- esac
-
- # Removing depends
- Remove_package
-
- # Saving cache
- Save_cache cache/packages_tasks
-
- # Creating stage file
- Create_stagefile .stage/chroot_tasks
-fi
Copied: dists/sid/live-helper/helpers/lh_chroot_tasks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_tasks)
===================================================================
--- dists/sid/live-helper/helpers/lh_chroot_tasks (rev 0)
+++ dists/sid/live-helper/helpers/lh_chroot_tasks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_tasks(1) - install tasks into chroot
+# 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 tasks into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing tasks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_tasks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
+then
+ # Restoring cache
+ Restore_cache cache/packages_tasks
+
+ # Checking depends
+ case "${LH_TASKSEL}" in
+ aptitude)
+ Check_package chroot/usr/bin/aptitude aptitude
+ ;;
+
+ tasksel)
+ Check_package chroot/usr/bin/tasksel tasksel
+ ;;
+ esac
+
+ # Installing depends
+ Install_package
+
+ # Installing tasks
+ case "${LH_TASKSEL}" in
+ aptitude)
+ Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
+ ;;
+
+ tasksel)
+ for TASK in ${LIVE_TASKS}
+ do
+ Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
+ done
+ ;;
+ esac
+
+ # Removing depends
+ Remove_package
+
+ # Saving cache
+ Save_cache cache/packages_tasks
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_tasks
+fi
Deleted: dists/sid/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_clean 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# lh_clean(1) - clean up system build directories
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="clean up system build directories"
-HELP=""
-USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
-
-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
-
-case "${1}" in
- all)
- "${0}" chroot
- "${0}" binary
- "${0}" lock
- "${0}" stage
- "${0}" source
-
- if [ -d chroot ]
- then
- mkdir -p .stage
- touch .stage/bootstrap
- fi
- ;;
-
- cache)
- ${LH_ROOT_COMMAND} rm -rf cache
- ;;
-
- chroot)
- ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
-
- ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
-
- if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
- then
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
- mkdir -p .stage
- touch .stage/bootstrap
- fi
-
- rm -f .stage/chroot*
- ;;
-
- binary)
- rm -f binary.iso
- rm -f binary.img
- rm -f binary*.tar.gz
- rm -f packages.txt
-
- rm -rf binary
- rm -rf tftpboot
-
- rm -f .stage/binary*
- ;;
-
- lock)
- rm -f .lock
- ;;
-
- purge)
- PURGE="true" "${0}" all
- "${0}" cache
- ;;
-
- stage)
- rm -rf .stage
- ;;
-
- source)
- rm -f source.iso
- rm -f source.img
- rm -f source*.tar
- rm -f source*.tar.gz
-
- rm -rf source
-
- rm -f .stage/source*
- ;;
-
- *)
- "${0}" all
- ;;
-esac
Copied: dists/sid/live-helper/helpers/lh_clean (from rev 1940, dists/trunk/live-helper/helpers/lh_clean)
===================================================================
--- dists/sid/live-helper/helpers/lh_clean (rev 0)
+++ dists/sid/live-helper/helpers/lh_clean 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# lh_clean(1) - clean up system build directories
+# 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="clean up system build directories"
+HELP=""
+USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
+
+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
+
+case "${1}" in
+ all)
+ "${0}" chroot
+ "${0}" binary
+ "${0}" lock
+ "${0}" stage
+ "${0}" source
+
+ if [ -d chroot ]
+ then
+ mkdir -p .stage
+ touch .stage/bootstrap
+ fi
+ ;;
+
+ cache)
+ ${LH_ROOT_COMMAND} rm -rf cache
+ ;;
+
+ chroot)
+ ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
+
+ ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
+
+ if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
+ then
+ ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+ mkdir -p .stage
+ touch .stage/bootstrap
+ fi
+
+ rm -f .stage/chroot*
+ ;;
+
+ binary)
+ rm -f binary.iso
+ rm -f binary.img
+ rm -f binary*.tar.gz
+ rm -f packages.txt
+
+ rm -rf binary
+ rm -rf tftpboot
+
+ rm -f .stage/binary*
+ ;;
+
+ lock)
+ rm -f .lock
+ ;;
+
+ purge)
+ PURGE="true" "${0}" all
+ "${0}" cache
+ ;;
+
+ stage)
+ rm -rf .stage
+ ;;
+
+ source)
+ rm -f source.iso
+ rm -f source.img
+ rm -f source*.tar
+ rm -f source*.tar.gz
+
+ rm -rf source
+
+ rm -f .stage/source*
+ ;;
+
+ *)
+ "${0}" all
+ ;;
+esac
Deleted: dists/sid/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_config 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,375 +0,0 @@
-#!/bin/sh
-
-# lh_config(1) - create configuration for live-helper(7)
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create configuration for live-helper(7)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-CONFIG="${1}"
-
-if [ -n "${LH_CONFIG}" ]
-then
- if [ -d ${LH_BASE-:/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
- then
- mkdir "${LH_CONFIG}"
- cp -r ${LH_BASE-:/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
-
- LIVE_ROOT="${LH_CONFIG}"
- CONFIG=""
- else
- Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE-:/usr/share/live-helper}/configs/."
- fi
-fi
-
-if [ "${CONFIG}" != "newconfig" ]
-then
- # Source existing configuration
- Read_conffile "${LIVE_ROOT}"/config/common
- Read_conffile "${LIVE_ROOT}"/config/bootstrap
- Read_conffile "${LIVE_ROOT}"/config/chroot
- Read_conffile "${LIVE_ROOT}"/config/binary
- Read_conffile "${LIVE_ROOT}"/config/source
-fi
-
-# Setting defaults
-Set_defaults
-
-# Creating bootstrap configuration
-mkdir -p "${LIVE_ROOT}"/config
-mkdir -p "${LIVE_ROOT}"/config/includes
-mkdir -p "${LIVE_ROOT}"/config/templates
-
-# Creating live-helper configuration
-cat > "${LIVE_ROOT}"/config/common << EOF
-# config/common - common options for live-helper(7)
-
-# \$LH_APT: set package manager
-# (Default: ${LH_APT})
-LH_APT="${LH_APT}"
-
-# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
-
-# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
-
-# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: ${LH_APT_PDIFFS})
-LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-
-# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: ${LH_APT_PIPELINE})
-LH_APT_PIPELINE="${LH_APT_PIPELINE}"
-
-# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: ${LH_APT_RECOMMENDS})
-LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-
-# \$LH_APT_SECURE: set apt/aptitude security
-# (Default: ${LH_APT_SECURE})
-LH_APT_SECURE="${LH_APT_SECURE}"
-
-# \$LH_BOOTSTRAP: set bootstrap program
-# (Default: ${LH_BOOTSTRAP})
-LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-
-# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: ${LH_CACHE_INDICES})
-LH_CACHE_INDICES="${LH_CACHE_INDICES}"
-
-# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: ${LH_CACHE_PACKAGES})
-LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
-
-# \$LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: ${LH_CACHE_STAGES})
-LH_CACHE_STAGES="${LH_CACHE_STAGES}"
-
-# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: ${LH_DEBCONF_FRONTEND})
-LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-
-# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: ${LH_DEBCONF_NOWARNINGS})
-LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-
-# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
-# \$LH_GENISOIMAGE: set genisoimage program
-# (Default: ${LH_GENISOIMAGE})
-LH_GENISOIMAGE="${LH_GENISOIMAGE}"
-
-# \$LH_INITRAMFS: set initramfs hook
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
-
-# \$LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="${LH_LOSETUP}"
-
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
-
-# \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# \$LH_TASKSEL: set tasksel program
-# (Default: ${LH_TASKSEL})
-LH_TASKSEL="${LH_TASKSEL}"
-
-# \$LIVE_ROOT: set root directory
-# (Default: ${LIVE_ROOT})
-LIVE_ROOT="${LIVE_ROOT}"
-
-# \$LIVE_INCLUDES: set includes
-# (Default: ${LIVE_INCLUDES})
-LIVE_INCLUDES="${LIVE_INCLUDES}"
-
-# \$LIVE_TEMPLATES: set templates
-# (Default: ${LIVE_TEMPLATES})
-LIVE_TEMPLATES="${LIVE_TEMPLATES}"
-
-# Live-helper options
-
-# \$LH_BREAKPOINTS: enable breakpoints
-# (Default: ${LH_BREAKPOINTS})
-#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
-
-# \$LH_DEBUG: enable debug
-# (Default: ${LH_DEBUG})
-#LH_DEBUG="${LH_DEBUG}"
-
-# \$LH_FORCE: enable force
-# (Default: ${LH_FORCE})
-#LH_FORCE="${LH_FORCE}"
-
-# \$LH_QUIET: enable quiet
-# (Default: ${LH_QUIET})
-#LH_QUIET="${LH_QUIET}"
-
-# \$LH_VERBOSE: enable verbose
-# (Default: ${LH_VERBOSE})
-#LH_VERBOSE="${LH_VERBOSE}"
-EOF
-
-# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# \$LIVE_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
-
-# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
-# (Default: empty)
-LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
-
-# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-
-# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
-
-# \$LIVE_DISTRIBUTION: select distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP})
-LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
-
-# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
-LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
-
-# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY})
-LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
-
-# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
-LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
-
-# \$LIVE_SECTIONS: select section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
-EOF
-
-# Creating lh_chroot_* configuration
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
-
-cat > "${LIVE_ROOT}"/config/chroot << EOF
-# config/chroot - options for live-helper(7), chroot stage
-
-# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: ${LIVE_CHROOT_FILESYSTEM})
-LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
-
-# \$LIVE_HOOKS: set hook commands
-# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
-
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
-
-# \$LIVE_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
-
-# \$LIVE_LANGUAGE: set language to use
-# (Default: empty)
-LIVE_LANGUAGE="${LIVE_LANGUAGE}"
-
-# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
-
-# \$LIVE_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
-
-# \$LIVE_PACKAGES: set packages to install
-# (Default: empty)
-LIVE_PACKAGES="${LIVE_PACKAGES}"
-
-# \$LIVE_PACKAGES_LISTS: set package list to install
-# (Default: ${LIVE_PACKAGES_LISTS})
-LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
-
-# \$LIVE_TASKS: set tasks to install
-# (Default: empty)
-LIVE_TASKS="${LIVE_TASKS}"
-
-# \$LIVE_SECURITY: enable security updates
-# (Default: ${LIVE_SECURITY})
-LIVE_SECURITY="${LIVE_SECURITY}"
-
-# \$LIVE_SYMLINKS: enable symlink convertion
-# (Default: ${LIVE_SYMLINKS})
-LIVE_SYMLINKS="${LIVE_SYMLINKS}"
-
-# \$LIVE_SYSVINIT: enable sysvinit
-# (Default: ${LIVE_SYSVINIT})
-LIVE_SYSVINIT="${LIVE_SYSVINIT}"
-EOF
-
-# Creating lh_binary_* configuration
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
-mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
-
-cat > "${LIVE_ROOT}"/config/binary << EOF
-# config/binary - options for live-helper(7), binary stage
-
-# \$LIVE_BINARY_IMAGES: set image type
-# (Default: ${LIVE_BINARY_IMAGES})
-LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
-
-# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LIVE_BINARY_INDICES})
-LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
-
-# \$LIVE_BOOTAPPEND: set boot parameters
-# (Default: empty)
-LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
-
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
-
-# \$LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LIVE_DEBIAN_INSTALLER})
-LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
-
-# \$LIVE_ENCRYPTION: set encrytion
-# (Default: empty)
-LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
-
-# \$LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
-
-# \$LIVE_HOSTNAME: set hostname
-# (Default: ${LIVE_HOSTNAME})
-LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-
-# \$LIVE_ISO_APPLICATION: set iso author
-# (Default: ${LIVE_ISO_APPLICATION})
-LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
-
-# \$LIVE_ISO_PREPARER: set iso preparer
-# (Default: ${LIVE_ISO_PREPARER})
-LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
-
-# \$LIVE_ISO_PUBLISHER: set iso preparer
-# (Default: ${LIVE_ISO_PUBLISHER})
-LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
-
-# \$LIVE_ISO_VOLUME: set iso volume
-# (Default: ${LIVE_ISO_VOLUME})
-LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
-
-# \$LIVE_NET_PATH: set netboot server directory
-# (Default: ${LIVE_NET_PATH})
-LIVE_NET_PATH="${LIVE_NET_PATH}"
-
-# \$LIVE_NET_SERVER: set netboot server address
-# (Default: ${LIVE_NET_SERVER})
-LIVE_NET_SERVER="${LIVE_NET_SERVER}"
-
-# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
-EOF
-
-# Creating lh_source_* configuration
-cat > "${LIVE_ROOT}"/config/source << EOF
-# config/source - options for live-helper(7), source stage
-
-# \$LIVE_SOURCE: set source option
-# (Default: ${LIVE_SOURCE})
-LIVE_SOURCE="${LIVE_SOURCE}"
-
-# \$LIVE_SOURCE_IMAGES: set image type
-# (Default: ${LIVE_SOURCE_IMAGES})
-LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
-EOF
Copied: dists/sid/live-helper/helpers/lh_config (from rev 1940, dists/trunk/live-helper/helpers/lh_config)
===================================================================
--- dists/sid/live-helper/helpers/lh_config (rev 0)
+++ dists/sid/live-helper/helpers/lh_config 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,377 @@
+#!/bin/sh
+
+# lh_config(1) - create configuration for live-helper(7)
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create configuration for live-helper(7)"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+CONFIG="${1}"
+
+if [ -n "${LH_CONFIG}" ]
+then
+ if [ -d ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
+ then
+ mkdir "${LH_CONFIG}"
+ cp -r ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
+
+ LIVE_ROOT="${LH_CONFIG}"
+ CONFIG=""
+ else
+ Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE:-/usr/share/live-helper}/configs/."
+ fi
+fi
+
+if [ "${CONFIG}" != "newconfig" ]
+then
+ # Source existing configuration
+ Read_conffile "${LIVE_ROOT}"/config/common
+ Read_conffile "${LIVE_ROOT}"/config/bootstrap
+ Read_conffile "${LIVE_ROOT}"/config/chroot
+ Read_conffile "${LIVE_ROOT}"/config/binary
+ Read_conffile "${LIVE_ROOT}"/config/source
+fi
+
+# Setting defaults
+Set_defaults
+
+# Creating bootstrap configuration
+mkdir -p "${LIVE_ROOT}"/config
+mkdir -p "${LIVE_ROOT}"/config/includes
+mkdir -p "${LIVE_ROOT}"/config/templates
+
+# Creating live-helper configuration
+cat > "${LIVE_ROOT}"/config/common << EOF
+# config/common - common options for live-helper(7)
+
+# \$LH_APT: set package manager
+# (Default: ${LH_APT})
+LH_APT="${LH_APT}"
+
+# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
+# (Default: autodetected or empty)
+LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
+
+# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
+# (Default: autodetected or empty)
+LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
+
+# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
+# (Default: ${LH_APT_PDIFFS})
+LH_APT_PDIFFS="${LH_APT_PDIFFS}"
+
+# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LH_APT_PIPELINE})
+LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+
+# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
+# (Default: ${LH_APT_RECOMMENDS})
+LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
+
+# \$LH_APT_SECURE: set apt/aptitude security
+# (Default: ${LH_APT_SECURE})
+LH_APT_SECURE="${LH_APT_SECURE}"
+
+# \$LH_BOOTSTRAP: set bootstrap program
+# (Default: ${LH_BOOTSTRAP})
+LH_BOOTSTRAP="${LH_BOOTSTRAP}"
+
+# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: ${LH_CACHE_INDICES})
+LH_CACHE_INDICES="${LH_CACHE_INDICES}"
+
+# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: ${LH_CACHE_PACKAGES})
+LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
+
+# \$LH_CACHE_STAGES: control if completed stages should be cached
+# (Default: ${LH_CACHE_STAGES})
+LH_CACHE_STAGES="${LH_CACHE_STAGES}"
+
+# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# (Default: ${LH_DEBCONF_FRONTEND})
+LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
+
+# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: ${LH_DEBCONF_NOWARNINGS})
+LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
+
+# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LH_DEBCONF_PRIORITY})
+LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+
+# \$LH_GENISOIMAGE: set genisoimage program
+# (Default: ${LH_GENISOIMAGE})
+LH_GENISOIMAGE="${LH_GENISOIMAGE}"
+
+# \$LH_INITRAMFS: set initramfs hook
+# (Default: ${LH_INITRAMFS})
+LH_INITRAMFS="${LH_INITRAMFS}"
+
+# \$LH_LOSETUP: set losetup program
+# (Default: autodetected)
+LH_LOSETUP="${LH_LOSETUP}"
+
+# \$LH_MODE: set distribution mode
+# (Default: ${LH_MODE})
+LH_MODE="${LH_MODE}"
+
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# \$LH_TASKSEL: set tasksel program
+# (Default: ${LH_TASKSEL})
+LH_TASKSEL="${LH_TASKSEL}"
+
+# \$LIVE_ROOT: set root directory
+# (Default: ${LIVE_ROOT})
+LIVE_ROOT="${LIVE_ROOT}"
+
+# \$LIVE_INCLUDES: set includes
+# (Default: ${LIVE_INCLUDES})
+LIVE_INCLUDES="${LIVE_INCLUDES}"
+
+# \$LIVE_TEMPLATES: set templates
+# (Default: ${LIVE_TEMPLATES})
+LIVE_TEMPLATES="${LIVE_TEMPLATES}"
+
+# Live-helper options
+
+# \$LH_BREAKPOINTS: enable breakpoints
+# (Default: ${LH_BREAKPOINTS})
+#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
+
+# \$LH_DEBUG: enable debug
+# (Default: ${LH_DEBUG})
+#LH_DEBUG="${LH_DEBUG}"
+
+# \$LH_FORCE: enable force
+# (Default: ${LH_FORCE})
+#LH_FORCE="${LH_FORCE}"
+
+# \$LH_QUIET: enable quiet
+# (Default: ${LH_QUIET})
+#LH_QUIET="${LH_QUIET}"
+
+# \$LH_VERBOSE: enable verbose
+# (Default: ${LH_VERBOSE})
+#LH_VERBOSE="${LH_VERBOSE}"
+EOF
+
+# Creating lh_bootstrap_* configuration
+cat > "${LIVE_ROOT}"/config/bootstrap << EOF
+# config/bootstrap - options for live-helper(7), bootstrap stage
+
+# \$LIVE_ARCHITECTURE: select chroot architecture
+# (Default: autodetected)
+LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
+
+# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# (Default: empty)
+LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
+
+# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
+LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+
+# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+
+# \$LIVE_DISTRIBUTION: select distribution to use
+# (Default: ${LIVE_DISTRIBUTION})
+LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
+
+# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
+
+# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
+LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
+
+# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
+
+# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
+LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
+
+# \$LIVE_SECTIONS: select section(s) to use
+# (Default: ${LIVE_SECTIONS})
+LIVE_SECTIONS="${LIVE_SECTIONS}"
+EOF
+
+# Creating lh_chroot_* configuration
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+
+cat > "${LIVE_ROOT}"/config/chroot << EOF
+# config/chroot - options for live-helper(7), chroot stage
+
+# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LIVE_CHROOT_FILESYSTEM})
+LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+
+# \$LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS="${LIVE_HOOKS}"
+
+# \$LIVE_INTERACTIVE: set interactive build
+# (Default: ${LIVE_INTERACTIVE})
+LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
+
+# \$LIVE_KEYRING_PACKAGES: set keyring packages
+# (Default: empty)
+LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
+
+# \$LIVE_LANGUAGE: set language to use
+# (Default: empty)
+LIVE_LANGUAGE="${LIVE_LANGUAGE}"
+
+# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
+
+# \$LIVE_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
+
+# \$LIVE_PACKAGES: set packages to install
+# (Default: empty)
+LIVE_PACKAGES="${LIVE_PACKAGES}"
+
+# \$LIVE_PACKAGES_LISTS: set package list to install
+# (Default: ${LIVE_PACKAGES_LISTS})
+LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
+
+# \$LIVE_TASKS: set tasks to install
+# (Default: empty)
+LIVE_TASKS="${LIVE_TASKS}"
+
+# \$LIVE_SECURITY: enable security updates
+# (Default: ${LIVE_SECURITY})
+LIVE_SECURITY="${LIVE_SECURITY}"
+
+# \$LIVE_SYMLINKS: enable symlink convertion
+# (Default: ${LIVE_SYMLINKS})
+LIVE_SYMLINKS="${LIVE_SYMLINKS}"
+
+# \$LIVE_SYSVINIT: enable sysvinit
+# (Default: ${LIVE_SYSVINIT})
+LIVE_SYSVINIT="${LIVE_SYSVINIT}"
+EOF
+
+# Creating lh_binary_* configuration
+mkdir -p "${LIVE_ROOT}"/config/binary_grub
+mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
+mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
+
+cat > "${LIVE_ROOT}"/config/binary << EOF
+# config/binary - options for live-helper(7), binary stage
+
+# \$LIVE_BINARY_IMAGES: set image type
+# (Default: ${LIVE_BINARY_IMAGES})
+LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
+
+# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LIVE_BINARY_INDICES})
+LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
+
+# \$LIVE_BOOTAPPEND: set boot parameters
+# (Default: empty)
+LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
+
+# \$LIVE_BOOTLOADER: set bootloader
+# (Default: ${LIVE_BOOTLOADER})
+LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+
+# \$LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LIVE_DEBIAN_INSTALLER})
+LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+
+# \$LIVE_ENCRYPTION: set encrytion
+# (Default: empty)
+LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
+
+# \$LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
+
+# \$LIVE_HOSTNAME: set hostname
+# (Default: ${LIVE_HOSTNAME})
+LIVE_HOSTNAME="${LIVE_HOSTNAME}"
+
+# \$LIVE_ISO_APPLICATION: set iso author
+# (Default: ${LIVE_ISO_APPLICATION})
+LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
+
+# \$LIVE_ISO_PREPARER: set iso preparer
+# (Default: ${LIVE_ISO_PREPARER})
+LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
+
+# \$LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: ${LIVE_ISO_PUBLISHER})
+LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
+
+# \$LIVE_ISO_VOLUME: set iso volume
+# (Default: ${LIVE_ISO_VOLUME})
+LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
+
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
+
+# \$LIVE_NET_PATH: set netboot server directory
+# (Default: ${LIVE_NET_PATH})
+LIVE_NET_PATH="${LIVE_NET_PATH}"
+
+# \$LIVE_NET_SERVER: set netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
+
+# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# (Default: empty)
+LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
+
+# \$LIVE_USERNAME: set username
+# (Default: ${LIVE_USERNAME})
+LIVE_USERNAME="${LIVE_USERNAME}"
+EOF
+
+# Creating lh_source_* configuration
+cat > "${LIVE_ROOT}"/config/source << EOF
+# config/source - options for live-helper(7), source stage
+
+# \$LIVE_SOURCE: set source option
+# (Default: ${LIVE_SOURCE})
+LIVE_SOURCE="${LIVE_SOURCE}"
+
+# \$LIVE_SOURCE_IMAGES: set image type
+# (Default: ${LIVE_SOURCE_IMAGES})
+LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
+EOF
Deleted: dists/sid/live-helper/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_losetup 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# lh_losetup - wrapper around losetup
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="wrapper around losetup"
-HELP=""
-USAGE="${PROGRAM} <device> <file> <partition>"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ -z "${1}" ]
-then
- DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
-else
- DEVICE="${1}"
-fi
-
-FILE="${2}"
-PARTITION="${3}"
-
-${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
-FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
-${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
-
-LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
-CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`
-#OFFSET="`expr 512 '*' ${CYL}`"
-OFFSET="$((CYL*512))"
-
-echo loop $DEVICE at offset $OFFSET
-
-if [ "${PARTITION}" = "0" ]
-then
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
-else
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
-fi
Copied: dists/sid/live-helper/helpers/lh_losetup (from rev 1940, dists/trunk/live-helper/helpers/lh_losetup)
===================================================================
--- dists/sid/live-helper/helpers/lh_losetup (rev 0)
+++ dists/sid/live-helper/helpers/lh_losetup 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# lh_losetup - wrapper around losetup
+# 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="wrapper around losetup"
+HELP=""
+USAGE="${PROGRAM} <device> <file> <partition>"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ -z "${1}" ]
+then
+ DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
+else
+ DEVICE="${1}"
+fi
+
+FILE="${2}"
+PARTITION="${3}"
+
+${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
+FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
+${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
+
+LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
+CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`
+#OFFSET="`expr 512 '*' ${CYL}`"
+OFFSET="$((CYL*512))"
+
+echo loop $DEVICE at offset $OFFSET
+
+if [ "${PARTITION}" = "0" ]
+then
+ ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
+else
+ ${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
+fi
Deleted: dists/sid/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# lh_source(1) - build source images
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source images"
-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
-
-# Enabling network in chroot
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_sources install ${*}
-
-# Preparing images
-lh_source_debian-live ${*}
-lh_source_debian ${*}
-lh_source_md5sum ${*}
-
-# Building images
-lh_source_generic ${*}
-lh_source_hdd ${*}
-lh_source_iso ${*}
-lh_source_net ${*}
-lh_source_usb-hdd ${*}
-
-# Deconfiguring chroot
-rm -f .stage/chroot_sources
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
Copied: dists/sid/live-helper/helpers/lh_source (from rev 1940, dists/trunk/live-helper/helpers/lh_source)
===================================================================
--- dists/sid/live-helper/helpers/lh_source (rev 0)
+++ dists/sid/live-helper/helpers/lh_source 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# lh_source(1) - build source images
+# 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="build source images"
+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
+
+# Enabling network in chroot
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_sources install ${*}
+
+# Preparing images
+lh_source_debian-live ${*}
+lh_source_debian ${*}
+lh_source_md5sum ${*}
+
+# Building images
+lh_source_generic ${*}
+lh_source_hdd ${*}
+lh_source_iso ${*}
+lh_source_net ${*}
+lh_source_usb-hdd ${*}
+
+# Deconfiguring chroot
+rm -f .stage/chroot_sources
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
Deleted: dists/sid/live-helper/helpers/lh_source_debian
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_debian 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_source_debian(1) - download sources
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="debian sources"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin downloading sources..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_debian
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian ]
-then
- rm -rf source/debian
-fi
-
-# Download sources
-Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
-echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
-#echo "live-helper" >> chroot/root/dpkg-selection.txt
-Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
-rm -f chroot/root/dpkg-selection.txt
-
-# Sort sources
-for DSC in chroot/*.dsc
-do
- SOURCE="`sed -n 's/^Source: //p' ${DSC}`"
-
- case "${SOURCE}" in
- lib?*)
- LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
- ;;
-
- *)
- LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
- ;;
- esac
-
- # Install directory
- mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
-
- # Move files
- mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
-done
-
-# Creating stage file
-Create_stagefile .stage/source_debian
Copied: dists/sid/live-helper/helpers/lh_source_debian (from rev 1940, dists/trunk/live-helper/helpers/lh_source_debian)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_debian (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_debian 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_source_debian(1) - download sources
+# 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="debian sources"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin downloading sources..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian ]
+then
+ rm -rf source/debian
+fi
+
+# Download sources
+Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
+echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
+#echo "live-helper" >> chroot/root/dpkg-selection.txt
+Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
+rm -f chroot/root/dpkg-selection.txt
+
+# Sort sources
+for DSC in chroot/*.dsc
+do
+ SOURCE="`sed -n 's/^Source: //p' ${DSC}`"
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+ ;;
+
+ *)
+ LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
+done
+
+# Creating stage file
+Create_stagefile .stage/source_debian
Deleted: dists/sid/live-helper/helpers/lh_source_debian-live
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian-live 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_debian-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# lh_source_debian-live(1) - copy debian-live config into source
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="copy debian-live config into source"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin copying live-helper configuration..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_debian-live
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian-live ]
-then
- rm -rf source/debian-live
-fi
-
-# Copy system configuration
-mkdir -p source/debian-live
-cp -a config source/debian-live
-
-# Create tarball
-cd source
-tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
-cd "${OLDPWD}"
-
-rm -rf source/debian-live/config
-mv source/debian-live-config_*.tar.gz source/debian-live
-
-# Creating stage file
-Create_stagefile .stage/source_debian-live
Copied: dists/sid/live-helper/helpers/lh_source_debian-live (from rev 1940, dists/trunk/live-helper/helpers/lh_source_debian-live)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_debian-live (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_debian-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# lh_source_debian-live(1) - copy debian-live config into source
+# 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 debian-live config into source"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin copying live-helper configuration..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian-live
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian-live ]
+then
+ rm -rf source/debian-live
+fi
+
+# Copy system configuration
+mkdir -p source/debian-live
+cp -a config source/debian-live
+
+# Create tarball
+cd source
+tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
+cd "${OLDPWD}"
+
+rm -rf source/debian-live/config
+mv source/debian-live-config_*.tar.gz source/debian-live
+
+# Creating stage file
+Create_stagefile .stage/source_debian-live
Deleted: dists/sid/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_generic 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_source_generic(1) - build source generic image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source generic image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic
-then
- exit 0
-fi
-
-Echo_message "Begin building source generic image..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_generic
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source.tar ]
-then
- rm -f source.tar
-fi
-
-# Create tarball
-tar cf source.tar source
-
-# Creating stage file
-Create_stagefile .stage/source_generic
Copied: dists/sid/live-helper/helpers/lh_source_generic (from rev 1940, dists/trunk/live-helper/helpers/lh_source_generic)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_generic (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_generic 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_source_generic(1) - build source generic image
+# 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="build source generic image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic
+then
+ exit 0
+fi
+
+Echo_message "Begin building source generic image..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_generic
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source.tar ]
+then
+ rm -f source.tar
+fi
+
+# Create tarball
+tar cf source.tar source
+
+# Creating stage file
+Create_stagefile .stage/source_generic
Deleted: dists/sid/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_source_hdd(1) - build source harddisk image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source harddisk image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building source harddisk image..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source-hdd.tar.gz ]
-then
- rm -f source-hdd.tar.gz
-fi
-
-# Create tarball
-tar cfz source-hdd.tar.gz source
-
-# Creating stage file
-Create_stagefile .stage/source_hdd
Copied: dists/sid/live-helper/helpers/lh_source_hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_source_hdd)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_hdd (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_source_hdd(1) - build source harddisk image
+# 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="build source harddisk image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building source harddisk image..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source-hdd.tar.gz ]
+then
+ rm -f source-hdd.tar.gz
+fi
+
+# Create tarball
+tar cfz source-hdd.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_hdd
Deleted: dists/sid/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# lh_source_iso(1) - build iso source image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build iso source image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
-then
- exit 0
-fi
-
-Echo_message "Begin building source iso image..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_iso
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
-
-# Installing depends
-Install_package
-
-# Remove old iso image
-if [ -f source.iso ]
-then
- rm -f source.iso
-fi
-
-if [ "${LH_VERBOSE}" = "enabled" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-fi
-
-if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
-fi
-
-if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
-fi
-
-if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
-fi
-
-if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
-fi
-
-# Moving image
-mv source chroot
-
-cat >> chroot/source.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
-EOF
-
-Chroot "sh source.sh"
-
-# Move image
-mv chroot/source chroot/source.iso ./
-rm -f chroot/source.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_iso
Copied: dists/sid/live-helper/helpers/lh_source_iso (from rev 1940, dists/trunk/live-helper/helpers/lh_source_iso)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_iso (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# lh_source_iso(1) - build iso source image
+# 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="build iso source image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
+then
+ exit 0
+fi
+
+Echo_message "Begin building source iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f source.iso ]
+then
+ rm -f source.iso
+fi
+
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
+
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv source chroot
+
+cat >> chroot/source.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
+EOF
+
+Chroot "sh source.sh"
+
+# Move image
+mv chroot/source chroot/source.iso ./
+rm -f chroot/source.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_iso
Deleted: dists/sid/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_source_md5sum(1) - create source md5sums
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create source md5sums"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin creating source md5sum.txt..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_md5sum
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old md5sums
-if [ -f source/md5sum.txt ]
-then
- rm -f source/md5sum.txt
-fi
-
-# Calculating md5sums
-cd source
-find . -type f | sort | xargs md5sum > ../md5sum.txt
-mv ../md5sum.txt ./
-cd "${OLDPWD}"
-
-# Creating stage file
-Create_stagefile .stage/source_md5sum
Copied: dists/sid/live-helper/helpers/lh_source_md5sum (from rev 1940, dists/trunk/live-helper/helpers/lh_source_md5sum)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_md5sum (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# lh_source_md5sum(1) - create source md5sums
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create source md5sums"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin creating source md5sum.txt..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_md5sum
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old md5sums
+if [ -f source/md5sum.txt ]
+then
+ rm -f source/md5sum.txt
+fi
+
+# Calculating md5sums
+cd source
+find . -type f | sort | xargs md5sum > ../md5sum.txt
+mv ../md5sum.txt ./
+cd "${OLDPWD}"
+
+# Creating stage file
+Create_stagefile .stage/source_md5sum
Deleted: dists/sid/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# lh_source_net(1) - build source net image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source net image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
-then
- exit 0
-fi
-
-Echo_message "Begin building source netboot image..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_net
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source-net.tar.gz ]
-then
- rm -f source-net.tar.gz
-fi
-
-# Create tarball
-tar cfz source-net.tar.gz source
-
-# Creating stage file
-Create_stagefile .stage/source_net
Copied: dists/sid/live-helper/helpers/lh_source_net (from rev 1940, dists/trunk/live-helper/helpers/lh_source_net)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_net (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# lh_source_net(1) - build source net image
+# 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="build source net image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
+then
+ exit 0
+fi
+
+Echo_message "Begin building source netboot image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_net
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source-net.tar.gz ]
+then
+ rm -f source-net.tar.gz
+fi
+
+# Create tarball
+tar cfz source-net.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_net
Deleted: dists/sid/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_source_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# lh_source_usb-hdd(1) - build source usb-hdd image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building source usb-hdd image..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_usb-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/sbin/parted parted
-
-# Installing depends
-Install_package
-
-# Remove old source
-if [ -f source.img ]
-then
- rm -f source.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="`du -ms source | cut -f1`"
-REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
-FREELO="`${LH_LOSETUP} -f`"
-if [ ! -b chroot/${FREELO} ]
-then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
-fi
-
-echo "!!! The following error/warning messages can be ignored !!!"
-lh_losetup $FREELO source.img 0
-Chroot "parted -s ${FREELO} mklabel msdos" || true
-Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-Chroot "parted -s ${FREELO} set 1 lba off" || true
-${LH_LOSETUP} -d ${FREELO}
-
-lh_losetup $FREELO source.img 1
-Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-mkdir -p source.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
-cp -r source/* source.tmp
-${LH_ROOT_COMMAND} umount source.tmp
-rmdir source.tmp
-${LH_LOSETUP} -d ${FREELO}
-echo "!!! The above error/warning messages can be ignored !!!"
-
-if [ -n "${MAKEDEV}" ]
-then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
-fi
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_usb-hdd
Copied: dists/sid/live-helper/helpers/lh_source_usb-hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_source_usb-hdd)
===================================================================
--- dists/sid/live-helper/helpers/lh_source_usb-hdd (rev 0)
+++ dists/sid/live-helper/helpers/lh_source_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# lh_source_usb-hdd(1) - build source usb-hdd image
+# 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="build source image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building source usb-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_usb-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/sbin/parted parted
+
+# Installing depends
+Install_package
+
+# Remove old source
+if [ -f source.img ]
+then
+ rm -f source.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms source | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO source.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+${LH_LOSETUP} -d ${FREELO}
+
+lh_losetup $FREELO source.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p source.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+cp -r source/* source.tmp
+${LH_ROOT_COMMAND} umount source.tmp
+rmdir source.tmp
+${LH_LOSETUP} -d ${FREELO}
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_usb-hdd
Deleted: dists/sid/live-helper/helpers/lh_testroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_testroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/lh_testroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# lh_testroot(1) - ensure that a system is built as root
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="ensure that a system is built as root"
-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
-
-# Checking user account
-if [ "`${LH_ROOT_COMMAND} id -u`" -ne "0" ]
-then
- Echo_error "need root privileges"
- exit 1
-fi
Copied: dists/sid/live-helper/helpers/lh_testroot (from rev 1940, dists/trunk/live-helper/helpers/lh_testroot)
===================================================================
--- dists/sid/live-helper/helpers/lh_testroot (rev 0)
+++ dists/sid/live-helper/helpers/lh_testroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# lh_testroot(1) - ensure that a system is built as root
+# 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="ensure that a system is built as root"
+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
+
+# Checking user account
+if [ "`${LH_ROOT_COMMAND} id -u`" -ne "0" ]
+then
+ Echo_error "need root privileges"
+ exit 1
+fi
Deleted: dists/sid/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-06-02 21:07:33 UTC (rev 1932)
+++ dists/sid/live-helper/helpers/make-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,407 +0,0 @@
-#!/bin/sh
-
-# make-live(1) - utility to build Debian Live systems
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-PROGRAM="`basename ${0}`"
-DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
-
-HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
-
-Local_arguments ()
-{
- ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
- if [ "${?}" -ne "0" ]
- then
- echo "Terminating." >&2
- exit 1
- fi
-
- if [ "${1}" = "config" ]
- then
- CONFIG="true"
- fi
-
- eval set -- "${ARGUMENTS}"
-
- while true
- do
- case "${1}" in
- # common
- --mode)
- LH_MODE="${2}"; shift 2
- ;;
-
- --config)
- LH_CONFIG="${2}"; shift 2
- ;;
-
- --apt)
- LH_APT="${2}"; shift 2
- ;;
-
- --apt-ftpproxy)
- LH_APT_FTPPROXY="${2}"; shift 2
- ;;
-
- --apt-httpproxy)
- LH_APT_HTTPPROXY="${2}"; shift 2
- ;;
-
- --binary-indices)
- LH_BINARY_INDICES="${2}"; shift 2
- ;;
-
- --apt-pdiffs)
- LH_APT_PDIFFS="${2}"; shift 2
- ;;
-
- --apt-recommends)
- LH_APT_RECOMMENDS="${2}"; shift 2
- ;;
-
- --apt-secure)
- LH_APT_SECURE="${2}"; shift 2
- ;;
-
- --bootstrap)
- LH_BOOTSTRAP="${2}"; shift 2
- ;;
-
- --cache)
- LH_CACHE="${2}"; shift 2
- ;;
-
- --debconf-frontend)
- LH_DEBCONF_FRONTEND="${2}"; shift 2
- ;;
-
- --debconf-priority)
- LH_DEBCONF_PRIORITY="${2}"; shift 2
- ;;
-
- --debconf-nowarnings)
- LH_DEBCONF_NOWARNINGS="${2}"; shift 2
- ;;
-
- --genisoimage)
- LH_GENISOIMAGE="${2}"; shift 2
- ;;
-
- --losetup)
- LH_LOSETUP="${2}"; shift 2
- ;;
-
- --tasksel)
- LH_TASKSEL="${2}"; shift 2
- ;;
-
- -r|--root)
- LIVE_ROOT="${2}"; shift 2
- ;;
-
- --root-command)
- LIVE_ROOT_COMMAND="${2}"; shift 2
- ;;
-
- # bootstrap
- -a|--architecture)
- LIVE_ARCHITECTURE="${2}"; shift 2
- ;;
-
- -d|--distribution)
- LIVE_DISTRIBUTION="${2}"; shift 2
- export LIVE_DISTRIBUTION
- ;;
-
- --distribution-config)
- LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
- ;;
-
- -f|--bootstrap-flavour)
- LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
- ;;
-
- -m|--mirror-bootstrap)
- LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
- ;;
-
- --mirror-bootstrap-security)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
- ;;
-
- --mirror-binary)
- LIVE_MIRROR_BINARY="${2}"; shift 2
- ;;
-
- --mirror-binary-security)
- LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
- ;;
-
- --sections)
- LIVE_SECTIONS="${2}"; shift 2
- ;;
-
- # chroot
- --interactive)
- LIVE_INTERACTIVE="${2}"; shift 2
- ;;
-
- --initramfs)
- LH_INITRAMFS="${2}"; shift 2
- ;;
-
- -k|--linux-flavours)
- LIVE_LINUX_FLAVOURS="${2}"; shift 2
- ;;
-
- --linux-packages)
- LIVE_LINUX_PACKAGES="${2}"; shift 2
- ;;
-
- --keyring-packages)
- LIVE_KEYRING_PACKAGS="${2}"; shift 2
- ;;
-
- --hooks)
- LIVE_HOOKS="${2}"; shift 2
- ;;
-
- -l|--language)
- LIVE_LANGUAGE="${2}"; shift 2
- ;;
-
- --packages)
- LIVE_PACKAGES="${2}"; shift 2
- ;;
-
- -p|--packages-lists)
- LIVE_PACKAGES_LISTS="${2}"; shift 2
- ;;
-
- --tasks)
- LIVE_TASKS="${2}"; shift 2
- ;;
-
- --security)
- LIVE_SECURITY="${2}"; shift 2
- ;;
-
- --symlinks)
- LIVE_SYMLINKS="${2}"; shift 2
- ;;
-
- --sysvinit)
- LIVE_SYSVINIT="${2}"; shift 2
- ;;
-
- # image
- --bootappend)
- LIVE_BOOTAPPEND="${2}"; shift 2
- ;;
-
- -e|--encryption)
- LIVE_ENCRYPTION="${2}"; shift 2
- ;;
-
- --username)
- LIVE_USERNAME="${2}"; shift 2
- ;;
-
- --hostname)
- LIVE_HOSTNAME="${2}"; shift 2
- ;;
-
- --chroot-filesystem)
- LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
- ;;
-
- --memtest)
- LIVE_MEMTEST="${2}"; shift 2
- ;;
-
- --iso-application)
- LIVE_ISO_APPLICATION="${2}"; shift 2
- ;;
-
- --iso-preparer)
- LIVE_ISO_PREPARER="${2}"; shift 2
- ;;
-
- --iso-publisher)
- LIVE_ISO_PUBLISHER="${2}"; shift 2
- ;;
-
- --iso-volume)
- LIVE_ISO_VOLUME="${2}"; shift 2
- ;;
-
- --net-server)
- LIVE_NET_SERVER="${2}"; shift 2
- ;;
-
- --net-path)
- LIVE_NET_PATH="${2}"; shift 2
- ;;
-
- --source)
- LIVE_SOURCE="${2}"; shift 2
- ;;
-
- --bootloader)
- LIVE_BOOTLOADER="${2}"; shift 2
- ;;
-
- --grub-splash)
- LIVE_GRUB_SPLASH="${2}"; shift 2
- ;;
-
- --syslinux-splash)
- LIVE_SYSLINUX_SPLASH="${2}"; shift 2
- ;;
-
- -b|--binary-images)
- LIVE_BINARY_IMAGES="${2}"; shift 2
- ;;
-
- -s|--source-images)
- LIVE_SOURCE_IMAGES="${2}"; shift 2
- ;;
-
- --includes)
- LIVE_INCLUDES="${2}"; shift 2
- ;;
-
- --templates)
- LIVE_TEMPLATES="${2}"; shift 2
- ;;
-
- # other
- -h|--help)
- Help; shift
- ;;
-
- -u|--usage)
- Usage; shift
- ;;
-
- -v|--version)
- Version; shift
- ;;
-
- --breakpoints)
- LH_BREAKPOINTS="enabled"; shift
- ;;
-
- --debug)
- LH_DEBUG="enabled"; shift
- ;;
-
- --force)
- LH_FORCE="enabled"; shift
- ;;
-
- --quiet)
- LH_QUIET="enabled"; shift
- ;;
-
- --verbose)
- LH_VERBOSE="enabled"; shift
- ;;
-
- --)
- shift; break
- ;;
-
- *)
- echo "Internal error."
- exit 1
- ;;
- esac
- done
-}
-
-Main ()
-{
- Local_arguments "${@}"
-
- Set_defaults
-
- ROOT="${ROOT:-$LIVE_ROOT}"
-
- # Source existing configuration
- Read_conffile "${ROOT}"/config/common
- Read_conffile "${ROOT}"/config/bootstrap
- Read_conffile "${ROOT}"/config/chroot
- Read_conffile "${ROOT}"/config/image
-
- Local_arguments "${@}"
-
- # Configuring (this is really shit!)
- LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
-
- if [ "${LH_BREAKPOINTS}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --breakpoints"
- fi
-
- if [ "${LH_DEBUG}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --debug"
- fi
-
- if [ "${LH_FORCE}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --force"
- fi
-
- if [ "${LH_QUIET}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --quiet"
- fi
-
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --verbose"
- fi
-
- # Building
- if [ -z "${CONFIG}" ]
- then
- cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
- fi
-}
-
-trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
- if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
- 0 1 2 3 9 15
-
-Main "${@}"
Copied: dists/sid/live-helper/helpers/make-live (from rev 1940, dists/trunk/live-helper/helpers/make-live)
===================================================================
--- dists/sid/live-helper/helpers/make-live (rev 0)
+++ dists/sid/live-helper/helpers/make-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,409 @@
+#!/bin/sh
+
+# make-live(1) - utility to build Debian Live systems
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# On Debian systems, the complete text of the GNU General Public License
+# can be found in /usr/share/common-licenses/GPL file.
+
+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
+PROGRAM="`basename ${0}`"
+DESCRIPTION="utility to build Debian Live systems"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+
+HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
+
+Local_arguments ()
+{
+ ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+
+ if [ "${?}" -ne "0" ]
+ then
+ echo "Terminating." >&2
+ exit 1
+ fi
+
+ if [ "${1}" = "config" ]
+ then
+ CONFIG="true"
+ fi
+
+ eval set -- "${ARGUMENTS}"
+
+ while true
+ do
+ case "${1}" in
+ # common
+ --mode)
+ LH_MODE="${2}"; shift 2
+ ;;
+
+ --config)
+ LH_CONFIG="${2}"; shift 2
+ ;;
+
+ --apt)
+ LH_APT="${2}"; shift 2
+ ;;
+
+ --apt-ftpproxy)
+ LH_APT_FTPPROXY="${2}"; shift 2
+ ;;
+
+ --apt-httpproxy)
+ LH_APT_HTTPPROXY="${2}"; shift 2
+ ;;
+
+ --binary-indices)
+ LH_BINARY_INDICES="${2}"; shift 2
+ ;;
+
+ --apt-pdiffs)
+ LH_APT_PDIFFS="${2}"; shift 2
+ ;;
+
+ --apt-recommends)
+ LH_APT_RECOMMENDS="${2}"; shift 2
+ ;;
+
+ --apt-secure)
+ LH_APT_SECURE="${2}"; shift 2
+ ;;
+
+ --bootstrap)
+ LH_BOOTSTRAP="${2}"; shift 2
+ ;;
+
+ --cache)
+ LH_CACHE="${2}"; shift 2
+ ;;
+
+ --debconf-frontend)
+ LH_DEBCONF_FRONTEND="${2}"; shift 2
+ ;;
+
+ --debconf-priority)
+ LH_DEBCONF_PRIORITY="${2}"; shift 2
+ ;;
+
+ --debconf-nowarnings)
+ LH_DEBCONF_NOWARNINGS="${2}"; shift 2
+ ;;
+
+ --genisoimage)
+ LH_GENISOIMAGE="${2}"; shift 2
+ ;;
+
+ --losetup)
+ LH_LOSETUP="${2}"; shift 2
+ ;;
+
+ --tasksel)
+ LH_TASKSEL="${2}"; shift 2
+ ;;
+
+ -r|--root)
+ LIVE_ROOT="${2}"; shift 2
+ ;;
+
+ --root-command)
+ LIVE_ROOT_COMMAND="${2}"; shift 2
+ ;;
+
+ # bootstrap
+ -a|--architecture)
+ LIVE_ARCHITECTURE="${2}"; shift 2
+ ;;
+
+ -d|--distribution)
+ LIVE_DISTRIBUTION="${2}"; shift 2
+ export LIVE_DISTRIBUTION
+ ;;
+
+ --distribution-config)
+ LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
+ ;;
+
+ -f|--bootstrap-flavour)
+ LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
+ ;;
+
+ -m|--mirror-bootstrap)
+ LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
+ ;;
+
+ --mirror-bootstrap-security)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
+ ;;
+
+ --mirror-binary)
+ LIVE_MIRROR_BINARY="${2}"; shift 2
+ ;;
+
+ --mirror-binary-security)
+ LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
+ ;;
+
+ --sections)
+ LIVE_SECTIONS="${2}"; shift 2
+ ;;
+
+ # chroot
+ --interactive)
+ LIVE_INTERACTIVE="${2}"; shift 2
+ ;;
+
+ --initramfs)
+ LH_INITRAMFS="${2}"; shift 2
+ ;;
+
+ -k|--linux-flavours)
+ LIVE_LINUX_FLAVOURS="${2}"; shift 2
+ ;;
+
+ --linux-packages)
+ LIVE_LINUX_PACKAGES="${2}"; shift 2
+ ;;
+
+ --keyring-packages)
+ LIVE_KEYRING_PACKAGS="${2}"; shift 2
+ ;;
+
+ --hooks)
+ LIVE_HOOKS="${2}"; shift 2
+ ;;
+
+ -l|--language)
+ LIVE_LANGUAGE="${2}"; shift 2
+ ;;
+
+ --packages)
+ LIVE_PACKAGES="${2}"; shift 2
+ ;;
+
+ -p|--packages-lists)
+ LIVE_PACKAGES_LISTS="${2}"; shift 2
+ ;;
+
+ --tasks)
+ LIVE_TASKS="${2}"; shift 2
+ ;;
+
+ --security)
+ LIVE_SECURITY="${2}"; shift 2
+ ;;
+
+ --symlinks)
+ LIVE_SYMLINKS="${2}"; shift 2
+ ;;
+
+ --sysvinit)
+ LIVE_SYSVINIT="${2}"; shift 2
+ ;;
+
+ # image
+ --bootappend)
+ LIVE_BOOTAPPEND="${2}"; shift 2
+ ;;
+
+ -e|--encryption)
+ LIVE_ENCRYPTION="${2}"; shift 2
+ ;;
+
+ --username)
+ LIVE_USERNAME="${2}"; shift 2
+ ;;
+
+ --hostname)
+ LIVE_HOSTNAME="${2}"; shift 2
+ ;;
+
+ --chroot-filesystem)
+ LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
+ ;;
+
+ --memtest)
+ LIVE_MEMTEST="${2}"; shift 2
+ ;;
+
+ --iso-application)
+ LIVE_ISO_APPLICATION="${2}"; shift 2
+ ;;
+
+ --iso-preparer)
+ LIVE_ISO_PREPARER="${2}"; shift 2
+ ;;
+
+ --iso-publisher)
+ LIVE_ISO_PUBLISHER="${2}"; shift 2
+ ;;
+
+ --iso-volume)
+ LIVE_ISO_VOLUME="${2}"; shift 2
+ ;;
+
+ --net-server)
+ LIVE_NET_SERVER="${2}"; shift 2
+ ;;
+
+ --net-path)
+ LIVE_NET_PATH="${2}"; shift 2
+ ;;
+
+ --source)
+ LIVE_SOURCE="${2}"; shift 2
+ ;;
+
+ --bootloader)
+ LIVE_BOOTLOADER="${2}"; shift 2
+ ;;
+
+ --grub-splash)
+ LIVE_GRUB_SPLASH="${2}"; shift 2
+ ;;
+
+ --syslinux-splash)
+ LIVE_SYSLINUX_SPLASH="${2}"; shift 2
+ ;;
+
+ -b|--binary-images)
+ LIVE_BINARY_IMAGES="${2}"; shift 2
+ ;;
+
+ -s|--source-images)
+ LIVE_SOURCE_IMAGES="${2}"; shift 2
+ ;;
+
+ --includes)
+ LIVE_INCLUDES="${2}"; shift 2
+ ;;
+
+ --templates)
+ LIVE_TEMPLATES="${2}"; shift 2
+ ;;
+
+ # other
+ -h|--help)
+ Help; shift
+ ;;
+
+ -u|--usage)
+ Usage; shift
+ ;;
+
+ -v|--version)
+ Version; shift
+ ;;
+
+ --breakpoints)
+ LH_BREAKPOINTS="enabled"; shift
+ ;;
+
+ --debug)
+ LH_DEBUG="enabled"; shift
+ ;;
+
+ --force)
+ LH_FORCE="enabled"; shift
+ ;;
+
+ --quiet)
+ LH_QUIET="enabled"; shift
+ ;;
+
+ --verbose)
+ LH_VERBOSE="enabled"; shift
+ ;;
+
+ --)
+ shift; break
+ ;;
+
+ *)
+ echo "Internal error."
+ exit 1
+ ;;
+ esac
+ done
+}
+
+Main ()
+{
+ Local_arguments "${@}"
+
+ Set_defaults
+
+ ROOT="${ROOT:-$LIVE_ROOT}"
+
+ # Source existing configuration
+ Read_conffile "${ROOT}"/config/common
+ Read_conffile "${ROOT}"/config/bootstrap
+ Read_conffile "${ROOT}"/config/chroot
+ Read_conffile "${ROOT}"/config/image
+
+ Local_arguments "${@}"
+
+ # Configuring (this is really shit!)
+ LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+
+ if [ "${LH_BREAKPOINTS}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --breakpoints"
+ fi
+
+ if [ "${LH_DEBUG}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --debug"
+ fi
+
+ if [ "${LH_FORCE}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --force"
+ fi
+
+ if [ "${LH_QUIET}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --quiet"
+ fi
+
+ if [ "${LH_VERBOSE}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --verbose"
+ fi
+
+ # Building
+ if [ -z "${CONFIG}" ]
+ then
+ cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
+ fi
+}
+
+trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
+ if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
+ 0 1 2 3 9 15
+
+Main "${@}"
Copied: dists/sid/live-helper/includes/etch/live/boot-parameters.txt (from rev 1943, dists/trunk/live-helper/includes/etch/live/boot-parameters.txt)
===================================================================
--- dists/sid/live-helper/includes/etch/live/boot-parameters.txt (rev 0)
+++ dists/sid/live-helper/includes/etch/live/boot-parameters.txt 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,40 @@
+Boot Parameters for Debian Live
+-------------------------------
+
+Updated for live-initramfs 1.87.6-1 on 2007-06-03.
+
+These options (can be combined) work from the ISOLINUX bootprompt:
+
+live access=v1|v2|v3|m1|m2 specify accessibility level
+live console=TTY,SPEED setting default console for live-getty
+live hostname=HOSTNAME override hostname value
+live integrity-check check media data integrity and md5sums
+live ip=IFACE,ADDRESS,NETMASK,GATEWAY specify network interface(s)
+live ip[=frommedia] skips dhcp/static, uses preconfiguration
+live keyb|kbd-chooser/method=KEYBOARD
+live klayout|console-setup/layoutcode=LAYOUT
+live kvariant|console-setup/variantcode=VARIANT
+live kmodel|console-setup/modelcode=CODE
+live koptions=OPTIONS
+live live-getty
+live live-media|bootfrom=DEVICE
+live live-media-encryption|encryption=TYPE
+live live-media-offset=BYTES
+live live-media-timeout=SECONDS
+live locale|debian-installer/local=LOCALE
+live module=NAME
+live netboot[=nfs|cifs]
+live noautologin
+live noxautologin
+live nopersistent
+live nosudo
+live noswap
+live persistent
+live quickreboot
+live showmounts
+live todisk=DEVICE
+live toram copy media to RAM and run from there
+live preseed/file|file=FILE
+live package/question=VALUE
+live xdebconf
+live xvideomode=RESOLUTION
Copied: releases/live-helper/1.0~a13-1 (from rev 1932, dists/trunk/live-helper)
Deleted: releases/live-helper/1.0~a13-1/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/debian/changelog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,101 +0,0 @@
-live-helper (1.0~a13-1) UNRELEASED; 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~a13-1/debian/changelog (from rev 1945, dists/trunk/live-helper/debian/changelog)
===================================================================
--- releases/live-helper/1.0~a13-1/debian/changelog (rev 0)
+++ releases/live-helper/1.0~a13-1/debian/changelog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,101 @@
+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~a13-1/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/docs/ChangeLog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,612 +0,0 @@
-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~a13-1/docs/ChangeLog (from rev 1945, dists/trunk/live-helper/docs/ChangeLog)
===================================================================
--- releases/live-helper/1.0~a13-1/docs/ChangeLog (rev 0)
+++ releases/live-helper/1.0~a13-1/docs/ChangeLog 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,616 @@
+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~a13-1/examples/cron/snapshots.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/snapshots.sh 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/examples/cron/snapshots.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-# Needs: build-essential fakeroot lsb-release svn [...]
-
-# Static variables
-PACKAGES="live-helper live-initramfs live-sysvinit live-webhelper"
-
-DEBEMAIL="debian-live-devel at lists.alioth.debian.org"
-EMAIL="debian-live-devel at lists.alioth.debian.org"
-DEBFULLNAME="Debian Live Autobuilder"
-NAME="Debian Live Autobuilder"
-
-export DEBEMAIL EMAIL DEBFULLNAME NAME
-
-TEMPDIR="/srv/tmp/svn-snapshots"
-SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshots"
-
-DATE_START="`date -R`"
-
-# Checking lock file
-if [ -f "${SERVER}"/Archive-Update-in-Progress ]
-then
- echo "E: locked."
- exit 1
-fi
-
-# Creating server directory
-if [ ! -d "${SERVER}" ]
-then
- mkdir -p "${SERVER}"
-fi
-
-# Creating lock trap
-trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Update-in-Progress; exit 0" 0 1 2 3 9 15
-
-# Creating lock file
-echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
-
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin snapshot build." >> /var/log/live
-
-# Processing packages
-for PACKAGE in ${PACKAGES}
-do
- # Cleaning build directory
- if [ -d "${TEMPDIR}" ]
- then
- rm -rf "${TEMPDIR}"
- fi
-
- # Creating build directory
- mkdir -p "${TEMPDIR}"
-
- # Getting sources
- cd "${TEMPDIR}"
- svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
-
- # Getting version
- cd "${TEMPDIR}"/${PACKAGE}
- VERSION="`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }'`"
-
- # Getting revision
- cd "${TEMPDIR}"/${PACKAGE}
- REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`"
-
- # Check for existing package
- if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ]
- then
- UPDATE_INDICES="true"
-
- # Renaming directory
- mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
-
- # Building package
- cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
- find . -type d -name .svn | xargs rm -rf
- dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}.
- dpkg-buildpackage -rfakeroot -sa -uc -us
-
- # Removing sources
- rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
-
- # Creating directory
- if [ ! -d "${SERVER}" ]
- then
- mkdir -p "${SERVER}"
- fi
-
- # Removing old packages
- rm -f "${SERVER}"/"${PACKAGE}"*
- # FIXME: parse ${SERVER}/${PACKAGE}*.changes
-
- # Moving packages
- mv "${TEMPDIR}"/${PACKAGE}* "${SERVER}"
- else
- # Remove sources
- rm -rf "${TEMPDIR}"/${PACKAGE}
- fi
-done
-
-if [ "${UPDATE_INDICES}" = "true" ]
-then
- LAST_UPDATE="`date -R`"
-
- cd "${SERVER}"
-
- # Updating binary indices
- apt-ftparchive packages ./ > Packages
- gzip -9 -c Packages > Packages.gz
-
- # Updating source indices
- apt-ftparchive sources ./ > Sources
- gzip -9 -c Sources > Sources.gz
-fi
-
-# Reading timestamp
-if [ -z "${LAST_UPDATE}" ]
-then
- LAST_UPDATE="`awk -F: '/Last update:/ { print $2":"$3":"$4 }' ${SERVER}/LAST_BUILD | sed -e 's/ //'`"
-fi
-
-# Writing timestamp
-cat > "${SERVER}"/LAST_BUILD << EOF
-Last run begin: ${DATE_START}
-Last run end: `date -R`
-
-Last update: ${LAST_UPDATE}
-EOF
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end snapshot build." >> /var/log/live
Copied: releases/live-helper/1.0~a13-1/examples/cron/snapshots.sh (from rev 1937, dists/trunk/live-helper/examples/cron/snapshots.sh)
===================================================================
--- releases/live-helper/1.0~a13-1/examples/cron/snapshots.sh (rev 0)
+++ releases/live-helper/1.0~a13-1/examples/cron/snapshots.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Needs: build-essential fakeroot lsb-release svn [...]
+
+# Static variables
+PACKAGES="live-helper live-initramfs live-sysvinit live-webhelper"
+
+DEBEMAIL="debian-live-devel at lists.alioth.debian.org"
+EMAIL="debian-live-devel at lists.alioth.debian.org"
+DEBFULLNAME="Debian Live Autobuilder"
+NAME="Debian Live Autobuilder"
+
+export DEBEMAIL EMAIL DEBFULLNAME NAME
+
+TEMPDIR="/srv/tmp/svn-snapshots"
+SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshots"
+
+DATE_START="`date -R`"
+
+# Checking lock file
+if [ -f "${SERVER}"/Archive-Update-in-Progress ]
+then
+ echo "E: locked."
+ exit 1
+fi
+
+# Creating server directory
+if [ ! -d "${SERVER}" ]
+then
+ mkdir -p "${SERVER}"
+fi
+
+# Creating lock trap
+trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Update-in-Progress; exit 0" 0 1 2 3 9 15
+
+# Creating lock file
+echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin snapshot build." >> /var/log/live
+
+# Processing packages
+for PACKAGE in ${PACKAGES}
+do
+ # Cleaning build directory
+ if [ -d "${TEMPDIR}" ]
+ then
+ rm -rf "${TEMPDIR}"
+ fi
+
+ # Creating build directory
+ mkdir -p "${TEMPDIR}"
+
+ # Getting sources
+ cd "${TEMPDIR}"
+ svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
+
+ # Getting version
+ cd "${TEMPDIR}"/${PACKAGE}
+ VERSION="`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }'`"
+
+ # Getting revision
+ cd "${TEMPDIR}"/${PACKAGE}
+ REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`"
+
+ # Check for existing package
+ if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ]
+ then
+ UPDATE_INDICES="true"
+
+ # Renaming directory
+ mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
+
+ # Building package
+ cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
+ find . -type d -name .svn | xargs rm -rf
+ dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}.
+ dpkg-buildpackage -rfakeroot -sa -uc -us
+
+ # Removing sources
+ rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
+
+ # Creating directory
+ mkdir -p "${SERVER}"
+
+ # Removing old packages
+ for FILE in `awk {'print $5'} "${SERVER}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$"`
+ do
+ rm -f "${SERVER}"/"${FILE}"
+ done
+
+ rm -f "${SERVER}"/"${PACKAGE}"*.changes
+
+ # Installing new packages
+ for FILE in `awk {'print $5'} "${TEMPDIR}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$"`
+ do
+ mv "${TEMPDIR}"/"${FILE}" "${SERVER}"
+ done
+
+ mv "${TEMPDIR}"/"${PACKAGE}"*.changes "${SERVER}"
+ else
+ # Remove sources
+ rm -rf "${TEMPDIR}"/${PACKAGE}
+ fi
+done
+
+if [ "${UPDATE_INDICES}" = "true" ]
+then
+ LAST_UPDATE="`date -R`"
+
+ cd "${SERVER}"
+
+ # Updating binary indices
+ apt-ftparchive packages ./ > Packages
+ gzip -9 -c Packages > Packages.gz
+
+ # Updating source indices
+ apt-ftparchive sources ./ > Sources
+ gzip -9 -c Sources > Sources.gz
+fi
+
+# Reading timestamp
+if [ -z "${LAST_UPDATE}" ]
+then
+ LAST_UPDATE="`awk -F: '/Last update:/ { print $2":"$3":"$4 }' ${SERVER}/LAST_BUILD | sed -e 's/ //'`"
+fi
+
+# Writing timestamp
+cat > "${SERVER}"/LAST_BUILD << EOF
+Last run begin: ${DATE_START}
+Last run end: `date -R`
+
+Last update: ${LAST_UPDATE}
+EOF
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end snapshot build." >> /var/log/live
Deleted: releases/live-helper/1.0~a13-1/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/functions/defaults.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,583 +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 value
- 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 "${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 we are root, disable root command
- if [ "`id -u`" = "0" ]
- then
- # FIXME: this is disabled until considered safe
- LIVE_ROOT_COMMAND=""
- 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}"
-
- # 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 "E: 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="E: 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 "E: 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 squashfs-modules-2.6 unionfs-modules-2.6"
- ;;
-
- ubuntu)
- LIVE_LINUX_PACKAGES="linux-image"
- ;;
- esac
-
- if [ -n "${LIVE_ENCRYPTION}" ]
- then
- LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
- fi
- fi
-
- # Setting packages string
- # LIVE_PACKAGES
-
- # Setting packages list string
- LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
-
- # Setting tasks string
- for LIST in ${LIVE_PACKAGES_LISTS}
- do
- case "${LIST}" in
- mini|minimal)
- LH_APT="apt-get"
- ;;
-
- gnome-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
- ;;
-
- kde-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
- ;;
-
- xfce-desktop)
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
- ;;
- esac
- done
-
- LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
- LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
-
- # Setting tasks
- # LIVE_TASKS
-
- # Setting security updates option
- 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:-generic}"
-}
Copied: releases/live-helper/1.0~a13-1/functions/defaults.sh (from rev 1940, dists/trunk/live-helper/functions/defaults.sh)
===================================================================
--- releases/live-helper/1.0~a13-1/functions/defaults.sh (rev 0)
+++ releases/live-helper/1.0~a13-1/functions/defaults.sh 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,583 @@
+#!/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 value
+ 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 "${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 we are root, disable root command
+ if [ "`id -u`" = "0" ]
+ then
+ # FIXME: this is disabled until considered safe
+ LIVE_ROOT_COMMAND=""
+ 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}"
+
+ # 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 "E: 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="E: 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 "E: 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 squashfs-modules-2.6 unionfs-modules-2.6"
+ ;;
+
+ ubuntu)
+ LIVE_LINUX_PACKAGES="linux-image"
+ ;;
+ esac
+
+ if [ -n "${LIVE_ENCRYPTION}" ]
+ then
+ LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6"
+ fi
+ fi
+
+ # Setting packages string
+ # LIVE_PACKAGES
+
+ # Setting packages list string
+ LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
+
+ # Setting tasks string
+ for LIST in ${LIVE_PACKAGES_LISTS}
+ do
+ case "${LIST}" in
+ mini|minimal)
+ LH_APT="apt-get"
+ ;;
+
+ gnome-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
+ ;;
+
+ kde-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
+ ;;
+
+ xfce-desktop)
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
+ ;;
+ esac
+ done
+
+ LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
+ LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
+
+ # Setting tasks
+ # LIVE_TASKS
+
+ # Setting security updates option
+ 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:-generic}"
+}
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# lh_binary(1) - build binary images
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build binary images"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Preparing root filesystem
-lh_binary_chroot ${*}
-
-# Configuring chroot
-lh_chroot_proc install ${*}
-lh_chroot_sysfs install ${*}
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_sources install ${*}
-
-# Building root filesystem
-lh_binary_rootfs ${*}
-lh_binary_manifest ${*}
-lh_binary_encryption ${*}
-
-# Prepare images
-lh_binary_linux-image ${*}
-lh_binary_debian-installer ${*}
-lh_binary_memtest ${*}
-lh_binary_grub ${*}
-lh_binary_syslinux ${*}
-lh_binary_yaboot ${*}
-lh_binary_includes ${*}
-lh_binary_local-includes ${*}
-lh_binary_md5sum ${*}
-
-# Building images
-lh_binary_hdd ${*}
-lh_binary_iso ${*}
-lh_binary_net ${*}
-lh_binary_usb-hdd ${*}
-
-# Deconfiguring chroot
-rm -f .stage/chroot_sources
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
-lh_chroot_sysfs remove ${*}
-lh_chroot_proc remove ${*}
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary (from rev 1940, dists/trunk/live-helper/helpers/lh_binary)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_binary(1) - build binary images
+# 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="build binary images"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Preparing root filesystem
+lh_binary_chroot ${*}
+
+# Configuring chroot
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_sources install ${*}
+
+# Building root filesystem
+lh_binary_rootfs ${*}
+lh_binary_manifest ${*}
+lh_binary_encryption ${*}
+
+# Prepare images
+lh_binary_linux-image ${*}
+lh_binary_debian-installer ${*}
+lh_binary_memtest ${*}
+lh_binary_grub ${*}
+lh_binary_syslinux ${*}
+lh_binary_yaboot ${*}
+lh_binary_includes ${*}
+lh_binary_local-includes ${*}
+lh_binary_md5sum ${*}
+
+# Building images
+lh_binary_hdd ${*}
+lh_binary_iso ${*}
+lh_binary_net ${*}
+lh_binary_usb-hdd ${*}
+
+# Deconfiguring chroot
+rm -f .stage/chroot_sources
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# lh_binary_chroot(1) - copy chroot into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="copy chroot into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin copying chroot..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_chroot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Normally, virtual filesystems are not mounted here, but people tend to be lazy
-if [ -f chroot/proc/version ]
-then
- ${LH_ROOT_COMMAND} umount chroot/proc
-fi
-
-if [ -d chroot/sys/kernel ]
-then
- ${LH_ROOT_COMMAND} umount chroot/sys
-fi
-
-# Removing old chroot
-${LH_ROOT_COMMAND} rm -rf chroot/chroot
-${LH_ROOT_COMMAND} rm -rf chroot.tmp
-
-# Copying new chroot
-${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
-${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
-
-if [ -n "${LH_ROOT_COMMAND}" ]
-then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_chroot
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_chroot)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# lh_binary_chroot(1) - copy chroot into chroot
+# 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 chroot into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin copying chroot..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_chroot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Normally, virtual filesystems are not mounted here, but people tend to be lazy
+if [ -f chroot/proc/version ]
+then
+ ${LH_ROOT_COMMAND} umount chroot/proc
+fi
+
+if [ -d chroot/sys/kernel ]
+then
+ ${LH_ROOT_COMMAND} umount chroot/sys
+fi
+
+# Removing old chroot
+${LH_ROOT_COMMAND} rm -rf chroot/chroot
+${LH_ROOT_COMMAND} rm -rf chroot.tmp
+
+# Copying new chroot
+${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
+${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_chroot
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,302 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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
-
-if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
-then
- exit 0
-fi
-
-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"
- DESTDIR_INSTALLER="cdrom"
- ;;
-
- net)
- DESTDIR="tftpboot"
- DESTDIR_INSTALLER="netboot"
-
- Echo_error "Not supported yet (FIXME)"
- exit 1
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/install"
- fi
- else
- DESTDIR="binary/install"
- fi
-
- DESTDIR_INSTALLER="hd-media"
- ;;
-esac
-
-# 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
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
-
-# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
-then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- fi
- else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- fi
-else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-fi
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
-fi
-
-FIXME ()
-{
-# Downloading udebs
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
-
-for DISTRIBUTION in frozen stable testing unstable
-do
- ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
-UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
-
-rm -f packages.di
-
-for UDEB in ${UDEBS}
-do
- mkdir -p binary/`dirname ${UDEB}`
- cd binary/`dirname ${UDEB}`
- wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
- cd "${OLDPWD}"
-done
-
-# Downloading debs
-if [ -d cache/packages_bootstrap ]
-then
- for FILE in cache/packages_bootstrap/*.deb
- do
- SOURCE="`dpkg -f ${FILE} Source`"
-
- 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
-
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
-
-cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: ${LIVE_DISTRIBUTION}
-Component: main
-Origin: Debian
-Label: Debian
-Architecture: ${LIVE_ARCHITECTURE}
-EOF
-
-mkdir -p cache/indices_debian-installer
-
-cat > cache/indices_debian-installer/archive << EOF
-Dir
-{
- ArchiveDir "binary";
- // OverrideDir "";
- // CacheDir "";
- FileListDir "cache/indices_debian-installer";
-};
-
-Default
-{
- Packages::Compress ". gzip";
- // Packages::Extension ".deb";
- // Sources::Extensions ".dsc";
- // Contents::Compress "gzip";
- // DeLinkLimit "0";
- // FileMode "0644";
-};
-
-TreeDefault
-{
- // MaxContentsChange
- // ContentsAge
- Directory "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
- Packages "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
- InternalPrefix "dists/\$(DIST)/\$(SECTION)/";
- Contents "dists/\$(DIST)/Contents-\$(ARCH)";
- // Contents::Header
- // BinCacheDB "cache.\$(DIST).\$(SECTION).\$(ARCH)";
- // FileList "filelist.\$(DIST).\$(SECTION).\$(ARCH)";
- FileList "filelist";
- // BinOverride "override.\$(DIST).\$(SECTION)";
-};
-
-tree "${LIVE_DISTRIBUTION}"
-{
- Sections "main";
- Architectures "${LIVE_ARCHITECTURE}";
-};
-EOF
-
-cd binary
-find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
-cd "${OLDPWD}"
-
-cat > cache/indices_debian-installer/release << EOF
-APT::FTPArchive::Release::Origin "Debian";
-APT::FTPArchive::Release::Label "Debian";
-APT::FTPArchive::Release::Suite "${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Version "4.0";
-APT::FTPArchive::Release::Codename "${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Date "`date -R`";
-APT::FTPArchive::Release::Architectures "${LIVE_ARCHITECTURE}";
-APT::FTPArchive::Release::Components "main";
-EOF
-
-apt-ftparchive generate cache/indices_debian-installer/archive
-apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-}
-
-mkdir binary/.disk
-echo "main" > binary/.disk/base_components
-touch binary/.disk/base_installable
-echo "not_complete" > binary/.disk/cd_type
-#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
-touch binary/.disk/mkisofs
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_debian-installer)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_debian-installer 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,304 @@
+#!/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
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
+then
+ exit 0
+fi
+
+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"
+ DESTDIR_INSTALLER="cdrom"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ DESTDIR_INSTALLER="netboot"
+
+ Echo_error "Not supported yet (FIXME)"
+ exit 1
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/install"
+ fi
+ else
+ DESTDIR="binary/install"
+ fi
+
+ DESTDIR_INSTALLER="hd-media"
+ ;;
+esac
+
+# 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
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR}"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ fi
+ else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ fi
+else
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+fi
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+ else
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ fi
+fi
+
+FIXME ()
+{
+# Downloading udebs
+mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+cd "${OLDPWD}"
+
+for DISTRIBUTION in frozen stable testing unstable
+do
+ ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
+UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
+
+rm -f packages.di
+
+for UDEB in ${UDEBS}
+do
+ mkdir -p binary/`dirname ${UDEB}`
+ cd binary/`dirname ${UDEB}`
+ wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+ cd "${OLDPWD}"
+done
+
+# Downloading debs
+if [ -d cache/packages_bootstrap ]
+then
+ for FILE in cache/packages_bootstrap/*.deb
+ do
+ SOURCE="`dpkg -f ${FILE} Source`"
+
+ 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
+
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
+Archive: ${LIVE_DISTRIBUTION}
+Component: main
+Origin: Debian
+Label: Debian
+Architecture: ${LIVE_ARCHITECTURE}
+EOF
+
+mkdir -p cache/indices_debian-installer
+
+cat > cache/indices_debian-installer/archive << EOF
+Dir
+{
+ ArchiveDir "binary";
+ // OverrideDir "";
+ // CacheDir "";
+ FileListDir "cache/indices_debian-installer";
+};
+
+Default
+{
+ Packages::Compress ". gzip";
+ // Packages::Extension ".deb";
+ // Sources::Extensions ".dsc";
+ // Contents::Compress "gzip";
+ // DeLinkLimit "0";
+ // FileMode "0644";
+};
+
+TreeDefault
+{
+ // MaxContentsChange
+ // ContentsAge
+ Directory "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
+ Packages "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
+ InternalPrefix "dists/\$(DIST)/\$(SECTION)/";
+ Contents "dists/\$(DIST)/Contents-\$(ARCH)";
+ // Contents::Header
+ // BinCacheDB "cache.\$(DIST).\$(SECTION).\$(ARCH)";
+ // FileList "filelist.\$(DIST).\$(SECTION).\$(ARCH)";
+ FileList "filelist";
+ // BinOverride "override.\$(DIST).\$(SECTION)";
+};
+
+tree "${LIVE_DISTRIBUTION}"
+{
+ Sections "main";
+ Architectures "${LIVE_ARCHITECTURE}";
+};
+EOF
+
+cd binary
+find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
+cd "${OLDPWD}"
+
+cat > cache/indices_debian-installer/release << EOF
+APT::FTPArchive::Release::Origin "Debian";
+APT::FTPArchive::Release::Label "Debian";
+APT::FTPArchive::Release::Suite "${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Version "4.0";
+APT::FTPArchive::Release::Codename "${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Date "`date -R`";
+APT::FTPArchive::Release::Architectures "${LIVE_ARCHITECTURE}";
+APT::FTPArchive::Release::Components "main";
+EOF
+
+apt-ftparchive generate cache/indices_debian-installer/archive
+apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+}
+
+mkdir binary/.disk
+echo "main" > binary/.disk/base_components
+touch binary/.disk/base_installable
+echo "not_complete" > binary/.disk/cd_type
+#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
+touch binary/.disk/mkisofs
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# lh_binary_encryption(1) - encrypts rootfs
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="encrypts rootfs"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ -z "${LIVE_ENCRYPTION}" ]
-then
- exit 0
-fi
-
-Echo_message "Begin encrypting root filesystem image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/binary_rootfs
-
-# Checking stage file
-Check_stagefile .stage/binary_encryption
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-case "${LIVE_CHROOT_FILESYSTEM}" in
- ext2)
- ROOTFS="ext2"
- ;;
-
- plain)
- Echo_warning "encryption not supported on plain filesystem."
- exit 0
- ;;
-
- squashfs)
- ROOTFS="squashfs"
- ;;
-esac
-
-# Checking depends
-Check_package chroot/usr/bin/aespipe aespipe
-
-# Installing depends
-Install_package
-
-# Moving image
-mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot
-
-echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
-
-cat >> chroot/encrypt.sh << EOF
-while true
-do
- cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
-
- echo -n "Something went wrong... Retry? [YES/no] "
-
- read ANSWER
-
- if [ "no" = "${ANSWER}" ]
- then
- unset ANSWER
- break
- fi
-done
-EOF
-
-Chroot "sh encrypt.sh"
-
-# Move image
-mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
-rm -f chroot/encrypt.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_encryption
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_encryption)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_encryption 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+# lh_binary_encryption(1) - encrypts rootfs
+# 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="encrypts rootfs"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ -z "${LIVE_ENCRYPTION}" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin encrypting root filesystem image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/binary_rootfs
+
+# Checking stage file
+Check_stagefile .stage/binary_encryption
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+case "${LIVE_CHROOT_FILESYSTEM}" in
+ ext2)
+ ROOTFS="ext2"
+ ;;
+
+ plain)
+ Echo_warning "encryption not supported on plain filesystem."
+ exit 0
+ ;;
+
+ squashfs)
+ ROOTFS="squashfs"
+ ;;
+esac
+
+# Checking depends
+Check_package chroot/usr/bin/aespipe aespipe
+
+# Installing depends
+Install_package
+
+# Moving image
+mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot
+
+echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
+
+cat >> chroot/encrypt.sh << EOF
+while true
+do
+ cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
+
+ echo -n "Something went wrong... Retry? [YES/no] "
+
+ read ANSWER
+
+ if [ "no" = "${ANSWER}" ]
+ then
+ unset ANSWER
+ break
+ fi
+done
+EOF
+
+Chroot "sh encrypt.sh"
+
+# Move image
+mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
+rm -f chroot/encrypt.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_encryption
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_grub 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,288 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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 lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- Echo_warning "skipping binary_grub, foreign architecture."
- exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
- if [ -d ../"${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
- else
- Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
- exit 1
- fi
-fi
-
-# Check local templates
-if [ -d config/templates/grub ]
-then
- LIVE_TEMPLATES="config/templates"
-fi
-
-# 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|usb-hdd|hdd)
- DESTDIR_LIVE="binary/live"
- DESTDIR_INSTALL="binary/install"
- ;;
-
- net)
- Echo_error "not 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 "${LIVE_INITRAMFS}" in
- casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
- ;;
-
- live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
- then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
- fi
- ;;
- esac
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
-
-# 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}" = "enabled" ]
-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"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- fi
-fi
-
-# Assembling memtest configuration
-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
- ;;
-
- usb-hdd|hdd)
- cp chroot/usr/lib/grub/*/stage1 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~a13-1/helpers/lh_binary_grub (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_grub)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_grub (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_grub 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,290 @@
+#!/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 lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ Echo_warning "skipping binary_grub, foreign architecture."
+ exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+ if [ -d ../"${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+ else
+ Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+ exit 1
+ fi
+fi
+
+# Check local templates
+if [ -d config/templates/grub ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
+# 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|usb-hdd|hdd)
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
+ ;;
+
+ net)
+ Echo_error "not 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 "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+
+# 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}" = "enabled" ]
+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"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ fi
+fi
+
+# Assembling memtest configuration
+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
+ ;;
+
+ usb-hdd|hdd)
+ cp chroot/usr/lib/grub/*/stage1 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~a13-1/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# lh_binary_hdd(1) - build harddisk binary image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build harddisk binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building binary harddisk image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old binary
-rm -f binary-hdd.tar.gz
-
-tar cfz binary-hdd.tar.gz binary
-
-# Creating stage file
-Create_stagefile .stage/binary_hdd
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_hdd)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_hdd (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# lh_binary_hdd(1) - build harddisk binary image
+# 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="build harddisk binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary harddisk image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old binary
+rm -f binary-hdd.tar.gz
+
+tar cfz binary-hdd.tar.gz binary
+
+# Creating stage file
+Create_stagefile .stage/binary_hdd
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,124 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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
-
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
- # Working arround vfat limitations
- if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
- then
- CP_OPTIONS="-L"
- fi
-
- # Copying d-i 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 d-i templates
- DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
- DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
-
- if [ "${LIVE_ARCHITECTURE}" = "i386" ]
- 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~a13-1/helpers/lh_binary_includes (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_includes)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_includes (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,126 @@
+#!/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
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+ # Working arround vfat limitations
+ if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+ then
+ CP_OPTIONS="-L"
+ fi
+
+ # Copying d-i 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 d-i templates
+ DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+ DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+ if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ 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~a13-1/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,137 +0,0 @@
-#!/bin/sh
-
-# lh_binary_iso(1) - build iso binary image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build iso binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
-then
- exit 0
-fi
-
-Echo_message "Begin building binary iso image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_iso
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
-
-# Installing depends
-Install_package
-
-# Remove old iso image
-if [ -f binary.iso ]
-then
- rm -f binary.iso
-fi
-
-if [ "${LH_VERBOSE}" = "enabled" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-fi
-
-if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
-fi
-
-if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
-fi
-
-if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
-fi
-
-if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
-fi
-
-# Moving image
-mv binary chroot
-
-# Create image
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
-then
- case "${LIVE_BOOTLOADER}" in
- grub)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
-
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
- fi
- ;;
-
- syslinux)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-
- if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
- fi
- ;;
-
- *)
- Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
- sleep 5
- ;;
- esac
-
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-fi
-
-cat >> chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
-EOF
-
-Chroot "sh binary.sh"
-
-# Move image
-mv chroot/binary chroot/binary.iso ./
-rm -f chroot/binary.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_iso
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_iso (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_iso)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_iso (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# lh_binary_iso(1) - build iso binary image
+# 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="build iso binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f binary.iso ]
+then
+ rm -f binary.iso
+fi
+
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
+
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv binary chroot
+
+# Create image
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
+then
+ case "${LIVE_BOOTLOADER}" in
+ grub)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+ fi
+ ;;
+
+ syslinux)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+ fi
+ ;;
+
+ *)
+ Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+ sleep 5
+ ;;
+ esac
+
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+fi
+
+cat >> chroot/binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
+EOF
+
+Chroot "sh binary.sh"
+
+# Move image
+mv chroot/binary chroot/binary.iso ./
+rm -f chroot/binary.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_iso
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install linux-image into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin install linux-image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_linux-image
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/live"
- fi
- else
- DESTDIR="binary/live"
- fi
- ;;
-esac
-
-# 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
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing linux-image
-cp chroot/boot/vmlinuz* "${DESTDIR}"
-cp chroot/boot/initrd.img* "${DESTDIR}"
-
-# Creating stage file
-Create_stagefile .stage/binary_linux-image
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_linux-image)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# lh_binary_linux-image(1) - install linux-image into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install linux-image into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin install linux-image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_linux-image
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing initrd backup files
+rm -f chroot/boot/initrd*bak*
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ DESTDIR="binary/live"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/live"
+ fi
+ else
+ DESTDIR="binary/live"
+ fi
+ ;;
+esac
+
+# 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
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing linux-image
+cp chroot/boot/vmlinuz* "${DESTDIR}"
+cp chroot/boot/initrd.img* "${DESTDIR}"
+
+# Creating stage file
+Create_stagefile .stage/binary_linux-image
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# lh_binary_local-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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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
-
-Echo_message "Begin copying binary local includes..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/binary_local-includes/* > /dev/null 2>&1
-then
- # Copying includes
- cd config/binary_local-includes
- find . | cpio -dmpu "${OLDPWD}"/binary
- cd "${OLDPWD}"
-
- # Removing symlinks
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
- then
- find binary -type l | xargs rm -f
- fi
-
- # Creating stage file
- Create_stagefile .stage/binary_local-includes
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_local-includes)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_binary_local-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
+
+Echo_message "Begin copying binary local includes..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/binary_local-includes/* > /dev/null 2>&1
+then
+ # Copying includes
+ cd config/binary_local-includes
+ find . | cpio -dmpu "${OLDPWD}"/binary
+ cd "${OLDPWD}"
+
+ # Removing symlinks
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+ then
+ find binary -type l | xargs rm -f
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/binary_local-includes
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# lh_binary_manifest(1) - create manifest
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create manifest"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin creating manifest..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_manifest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Add filesystem.manifest
-Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest
-
-# Add packages.list
-Chroot "dpkg -l" > packages.txt
-
-# Creating stage file
-Create_stagefile .stage/binary_manifest
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_manifest)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_manifest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# lh_binary_manifest(1) - create manifest
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create manifest"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin creating manifest..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_manifest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Add filesystem.manifest
+Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest
+
+# Add packages.list
+Chroot "dpkg -l" > packages.txt
+
+# Creating stage file
+Create_stagefile .stage/binary_manifest
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# lh_binary_md5sum(1) - create binary md5sums
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create binary md5sums"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin creating binary md5sum.txt..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_md5sum
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old md5sums
-if [ -f binary/md5sum.txt ]
-then
- rm -f binary/md5sum.txt
-fi
-
-# Calculating md5sums
-cd binary
-find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt
-mv ../md5sum.txt ./
-
-cd "${OLDPWD}"
-
-# Creating stage file
-Create_stagefile .stage/binary_md5sum
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_md5sum)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# lh_binary_md5sum(1) - create binary md5sums
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create binary md5sums"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin creating binary md5sum.txt..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_md5sum
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old md5sums
+if [ -f binary/md5sum.txt ]
+then
+ rm -f binary/md5sum.txt
+fi
+
+# Calculating md5sums
+cd binary
+find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt
+mv ../md5sum.txt ./
+
+cd "${OLDPWD}"
+
+# Creating stage file
+Create_stagefile .stage/binary_md5sum
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest(1) - installs a memtest 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="installs a memtest 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_MEMTEST}" = "disabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin installing memtest..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- Echo_warning "skipping binary_memtest, foreign architecture."
- exit 0
-fi
-
-# Checking depends
-case "${LIVE_MEMTEST}" in
- memtest86)
- Check_package chroot/boot/memtest86.bin memtest86
- ;;
-
- memtest86+)
- Check_package chroot/boot/memtest86+.bin memtest86+
- ;;
-esac
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/live"
- fi
- else
- DESTDIR="binary/live"
- fi
- ;;
-esac
-
-# 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"
- ;;
- esac
- fi
-fi
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing memtest
-case "${LIVE_MEMTEST}" in
- memtest86)
- cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
- ;;
-
- memtest86+)
- cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_memtest
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_memtest)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_memtest 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest 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 a memtest 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_MEMTEST}" = "disabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin installing memtest..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ Echo_warning "skipping binary_memtest, foreign architecture."
+ exit 0
+fi
+
+# Checking depends
+case "${LIVE_MEMTEST}" in
+ memtest86)
+ Check_package chroot/boot/memtest86.bin memtest86
+ ;;
+
+ memtest86+)
+ Check_package chroot/boot/memtest86+.bin memtest86+
+ ;;
+esac
+
+# Installing depends
+Install_package
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ DESTDIR="binary/live"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/live"
+ fi
+ else
+ DESTDIR="binary/live"
+ fi
+ ;;
+esac
+
+# 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"
+ ;;
+ esac
+ fi
+fi
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing memtest
+case "${LIVE_MEMTEST}" in
+ memtest86)
+ cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
+ ;;
+
+ memtest86+)
+ cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# lh_binary_net(1) - build netboot binary image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build netboot binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
-then
- exit 0
-fi
-
-Echo_message "Begin building binary netboot image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_net
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old binary
-if [ -f binary-net.tar.gz ]
-then
- rm -f binary-net.tar.gz
-fi
-
-# Creating image file
-if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
-then
- mv chroot chroot.tmp
-fi
-
-mv binary "`basename ${LIVE_NET_PATH}`"
-
-cd ..
-tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
-mv binary-net.tar.gz "${OLDPWD}"
-cd "${OLDPWD}"
-
-mv "`basename ${LIVE_NET_PATH}`" binary
-
-if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
-then
- mv chroot.tmp chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_net
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_net (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_net)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_net (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# lh_binary_net(1) - build netboot binary image
+# 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="build netboot binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary netboot image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_net
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old binary
+if [ -f binary-net.tar.gz ]
+then
+ rm -f binary-net.tar.gz
+fi
+
+# Creating image file
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+ mv chroot chroot.tmp
+fi
+
+mv binary "`basename ${LIVE_NET_PATH}`"
+
+cd ..
+tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+mv binary-net.tar.gz "${OLDPWD}"
+cd "${OLDPWD}"
+
+mv "`basename ${LIVE_NET_PATH}`" binary
+
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+ mv chroot.tmp chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_net
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,149 +0,0 @@
-#!/bin/sh
-
-# lh_binary_rootfs(1) - build rootfs image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build rootfs image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin building root filesystem image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/binary_chroot
-
-# Checking stage file
-Check_stagefile .stage/binary_rootfs
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
- casper)
- INITFS="casper"
- ;;
-
- live-initramfs)
- INITFS="live"
- ;;
-esac
-
-# Creating directory
-mkdir -p binary/${INITFS}
-
-case "${LIVE_CHROOT_FILESYSTEM}" in
- ext2)
- # Checking depends
- Check_package chroot/usr/bin/genext2fs genext2fs
-
- # Installing depends
- Install_package
-
- # Remove old ext2 image
- if [ -f binary/${INITFS}/filesystem.ext2 ]
- then
- rm -f binary/${INITFS}/filesystem.ext2
- fi
-
- DU_DIM="`du -ks chroot | cut -f1`"
- REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
-
- Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
-
- # Move image
- mv chroot/filesystem.ext2 binary/${INITFS}
- rm -rf chroot/chroot
-
- # Removing depends
- Remove_package
- ;;
-
- plain)
- if [ -d binary/${INITFS}/filesystem.dir ]
- then
- rm -rf binary/${INITFS}/filesystem.dir
- fi
-
- mv chroot/chroot binary/${INITFS}/filesystem.dir
- ;;
-
- squashfs)
- # Checking depends
- Check_package chroot/usr/sbin/mksquashfs squashfs-tools
-
- # Installing depends
- Install_package
-
- # Remove old squashfs image
- if [ -f binary/${INITFS}/filesystem.squashfs ]
- then
- rm -f binary/${INITFS}/filesystem.squashfs
- fi
-
- if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
- fi
-
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
- fi
-
- if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
- fi
-
- if [ -f config/binary_rootfs/squashfs.sort ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
- cp config/binary_rootfs/squashfs.sort chroot
- fi
-
- # Create image
- Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
-
- # Move image
- ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
- ${LH_ROOT_COMMAND} rm -rf chroot/chroot chroot/squashfs.sort
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/${INITFS}
- fi
-
- # Removing depends
- Remove_package
- ;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_rootfs
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_rootfs)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_rootfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+# lh_binary_rootfs(1) - build rootfs image
+# 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="build rootfs image"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin building root filesystem image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/binary_chroot
+
+# Checking stage file
+Check_stagefile .stage/binary_rootfs
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+ casper)
+ INITFS="casper"
+ ;;
+
+ live-initramfs)
+ INITFS="live"
+ ;;
+esac
+
+# Creating directory
+mkdir -p binary/${INITFS}
+
+case "${LIVE_CHROOT_FILESYSTEM}" in
+ ext2)
+ # Checking depends
+ Check_package chroot/usr/bin/genext2fs genext2fs
+
+ # Installing depends
+ Install_package
+
+ # Remove old ext2 image
+ if [ -f binary/${INITFS}/filesystem.ext2 ]
+ then
+ rm -f binary/${INITFS}/filesystem.ext2
+ fi
+
+ DU_DIM="`du -ks chroot | cut -f1`"
+ REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+
+ Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
+
+ # Move image
+ mv chroot/filesystem.ext2 binary/${INITFS}
+ rm -rf chroot/chroot
+
+ # Removing depends
+ Remove_package
+ ;;
+
+ plain)
+ if [ -d binary/${INITFS}/filesystem.dir ]
+ then
+ rm -rf binary/${INITFS}/filesystem.dir
+ fi
+
+ mv chroot/chroot binary/${INITFS}/filesystem.dir
+ ;;
+
+ squashfs)
+ # Checking depends
+ Check_package chroot/usr/sbin/mksquashfs squashfs-tools
+
+ # Installing depends
+ Install_package
+
+ # Remove old squashfs image
+ if [ -f binary/${INITFS}/filesystem.squashfs ]
+ then
+ rm -f binary/${INITFS}/filesystem.squashfs
+ fi
+
+ if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
+ fi
+
+ if [ "${LH_VERBOSE}" = "enabled" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
+ fi
+
+ if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+ fi
+
+ if [ -f config/binary_rootfs/squashfs.sort ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
+ cp config/binary_rootfs/squashfs.sort chroot
+ fi
+
+ # Create image
+ Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+
+ # Move image
+ ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
+ ${LH_ROOT_COMMAND} rm -rf chroot/chroot chroot/squashfs.sort
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/${INITFS}
+ fi
+
+ # Removing depends
+ Remove_package
+ ;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/binary_rootfs
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,517 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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 lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
- Echo_warning "skipping binary_syslinux, foreign architecture."
- exit 0
-fi
-
-# Checking user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
- if [ -d ../"${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
- else
- Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
- exit 1
- fi
-fi
-
-# Check local templates
-if [ -d config/templates/syslinux ]
-then
- LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/bin/syslinux syslinux
-
-# 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)
- DESTDIR_LIVE="tftpboot"
- DESTDIR_INSTALL="tftpboot"
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- DESTDIR_LIVE="binary"
- DESTDIR_INSTALL="binary"
- else
- DESTDIR_LIVE="binary/live"
- DESTDIR_INSTALL="binary/install"
- fi
- ;;
-esac
-
-# 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 "${LIVE_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
-
-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
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- else
- LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
-else
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-fi
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- else
- LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
- else
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- else
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
- fi
- done
-fi
-
-# Removing '//'
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
- then
- VMLINUZ_DI="vmlinuz.di"
- INITRD_DI="initrddi.gz"
-
- VMLINUZ_GI="vmlinuz.gi"
- INITRD_GI="initrdgi.gz"
- else
- VMLINUZ_DI="vmlinuz"
- INITRD_DI="initrd.gz"
-
- VMLINUZ_GI="gtk/vmlinuz"
- INITRD_GI="gtk/initrd.gz"
- fi
- else
- VMLINUZ_DI="vmlinuz"
- INITRD_DI="initrd.gz"
-
- VMLINUZ_GI="gtk/vmlinuz"
- INITRD_GI="gtk/initrd.gz"
- fi
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
- fi
-
- LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
- fi
- else
- LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
- fi
-
- LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
- fi
-
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
- then
- LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
- fi
- fi
-fi
-
-LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
- if [ "${LIVE_BINARY_IMAGES}" != "net" ]
- then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
- then
- MEMTEST="LABEL memtest\n\tkernel memtest"
- else
- MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
- fi
- else
- MEMTEST="LABEL memtest\n\tkernel memtest"
- fi
-
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-case "${LIVE_BINARY_IMAGES}" in
- 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
- 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
- ;;
-
- 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
- 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
- ;;
-
- usb-hdd|hdd)
- # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/syslinux"
- fi
-
- # Copying syslinux
- mkdir -p "${DESTDIR}"
- cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
- cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
- mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
-
- # Copying splash screen
- if [ -f config/binary_syslinux/splash.rle ]
- 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
-
- # Remove unused files
- rm -f "${DESTDIR}"/pxelinux.cfg
-
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
- then
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- NUMBER=$(($NUMBER + 1))
-
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
- mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
- sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
- done
- else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
- fi
- fi
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_syslinux)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_syslinux 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,519 @@
+#!/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 lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+ Echo_warning "skipping binary_syslinux, foreign architecture."
+ exit 0
+fi
+
+# Checking user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+ if [ -d ../"${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+ else
+ Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+ exit 1
+ fi
+fi
+
+# Check local templates
+if [ -d config/templates/syslinux ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
+
+# 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)
+ DESTDIR_LIVE="tftpboot"
+ DESTDIR_INSTALL="tftpboot"
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ DESTDIR_LIVE="binary"
+ DESTDIR_INSTALL="binary"
+ else
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
+ fi
+ ;;
+esac
+
+# 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 "${LIVE_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
+
+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
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
+else
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+ LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+fi
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+ for KERNEL in chroot/boot/vmlinuz*
+ do
+ if [ -z "${LINUX}" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
+ else
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ else
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+ fi
+ fi
+ done
+fi
+
+# Removing '//'
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ then
+ VMLINUZ_DI="vmlinuz.di"
+ INITRD_DI="initrddi.gz"
+
+ VMLINUZ_GI="vmlinuz.gi"
+ INITRD_GI="initrdgi.gz"
+ else
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ fi
+ else
+ VMLINUZ_DI="vmlinuz"
+ INITRD_DI="initrd.gz"
+
+ VMLINUZ_GI="gtk/vmlinuz"
+ INITRD_GI="gtk/initrd.gz"
+ fi
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+ fi
+ else
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+ fi
+
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+ then
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+ fi
+ fi
+fi
+
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+ if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+ then
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+ then
+ MEMTEST="LABEL memtest\n\tkernel memtest"
+ else
+ MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
+ fi
+ else
+ MEMTEST="LABEL memtest\n\tkernel memtest"
+ fi
+
+ MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+case "${LIVE_BINARY_IMAGES}" in
+ 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
+ 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
+ ;;
+
+ 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_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
+ 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
+ ;;
+
+ usb-hdd|hdd)
+ # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ DESTDIR="binary"
+ else
+ DESTDIR="binary/syslinux"
+ fi
+
+ # Copying syslinux
+ mkdir -p "${DESTDIR}"
+ cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+ cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+ mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
+
+ # Copying splash screen
+ if [ -f config/binary_syslinux/splash.rle ]
+ 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#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+ sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+
+ # Remove unused files
+ rm -f "${DESTDIR}"/pxelinux.cfg
+
+ # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ then
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ NUMBER=$(($NUMBER + 1))
+
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+ sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
+ done
+ else
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+ fi
+ fi
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,155 +0,0 @@
-#!/bin/sh
-
-# lh_binary_usb-hdd(1) - build binary usb-hdd image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build binary image"
-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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building binary usb-hdd image..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/chroot_proc
-
-# Checking stage file
-Check_stagefile .stage/binary_usb-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/usr/sbin/mtools mtools
-Check_package chroot/sbin/parted parted
-
-case "${LIVE_BOOTLOADER}" in
- grub)
- Check_package chroot/usr/sbin/grub grub
- ;;
-
- syslinux)
- Check_package chroot/usr/bin/syslinux syslinux
- ;;
-esac
-
-# Installing depends
-Install_package
-
-# Remove old binary
-if [ -f binary.img ]
-then
- rm -f binary.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="`du -ms binary | cut -f1`"
-REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
-FREELO="`${LH_LOSETUP} -f`"
-if [ ! -b chroot/${FREELO} ]
-then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
-fi
-
-echo "!!! The following error/warning messages can be ignored !!!"
-lh_losetup $FREELO binary.img 0
-Chroot "parted -s ${FREELO} mklabel msdos" || true
-Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-Chroot "parted -s ${FREELO} set 1 boot on" || true
-Chroot "parted -s ${FREELO} set 1 lba off" || true
-
-case "${LIVE_BOOTLOADER}" in
- grub)
- #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
-#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
-#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
-#
-#quit
-#EOF
- #rm -f binary/boot/grub/device.map
-
- #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
- ;;
-
- syslinux)
- cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
- ;;
-esac
-
-${LH_LOSETUP} -d ${FREELO}
-
-FREELO="`${LH_LOSETUP} -f`"
-lh_losetup $FREELO binary.img 1
-Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-mkdir -p binary.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
-cp -r binary/* binary.tmp
-${LH_ROOT_COMMAND} umount binary.tmp
-rmdir binary.tmp
-
-if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-then
- Chroot "syslinux ${FREELO}"
-fi
-
-${LH_LOSETUP} -d ${FREELO}
-
-#if [ "${LIVE_BOOTLOADER}" = "grub" ]
-#then
-# FREELO="`${LH_LOSETUP} -f`"
-# lh_losetup $FREELO binary.img 0
-
-# dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
-# dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
-
-# ${LH_LOSETUP} -d ${FREELO}
-#fi
-echo "!!! The above error/warning messages can be ignored !!!"
-
-if [ -n "${MAKEDEV}" ]
-then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
-fi
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_usb-hdd
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_usb-hdd)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+# lh_binary_usb-hdd(1) - build binary usb-hdd image
+# 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="build binary image"
+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 ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building binary usb-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/chroot_proc
+
+# Checking stage file
+Check_stagefile .stage/binary_usb-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/usr/sbin/mtools mtools
+Check_package chroot/sbin/parted parted
+
+case "${LIVE_BOOTLOADER}" in
+ grub)
+ Check_package chroot/usr/sbin/grub grub
+ ;;
+
+ syslinux)
+ Check_package chroot/usr/bin/syslinux syslinux
+ ;;
+esac
+
+# Installing depends
+Install_package
+
+# Remove old binary
+if [ -f binary.img ]
+then
+ rm -f binary.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms binary | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO binary.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 boot on" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+
+case "${LIVE_BOOTLOADER}" in
+ grub)
+ #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
+#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
+#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
+#
+#quit
+#EOF
+ #rm -f binary/boot/grub/device.map
+
+ #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
+ ;;
+
+ syslinux)
+ cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+ ;;
+esac
+
+${LH_LOSETUP} -d ${FREELO}
+
+FREELO="`${LH_LOSETUP} -f`"
+lh_losetup $FREELO binary.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p binary.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
+cp -r binary/* binary.tmp
+${LH_ROOT_COMMAND} umount binary.tmp
+rmdir binary.tmp
+
+if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+then
+ Chroot "syslinux ${FREELO}"
+fi
+
+${LH_LOSETUP} -d ${FREELO}
+
+#if [ "${LIVE_BOOTLOADER}" = "grub" ]
+#then
+# FREELO="`${LH_LOSETUP} -f`"
+# lh_losetup $FREELO binary.img 0
+
+# dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
+# dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
+
+# ${LH_LOSETUP} -d ${FREELO}
+#fi
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_usb-hdd
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,227 +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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/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 lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
-then
- Echo_warning "skipping binary_yaboot, foreign architecture."
- exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
- if [ -d ../"${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
- else
- Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
- exit 1
- fi
-fi
-
-# Checking local templates
-if [ -d config/templates/yaboot ]
-then
- LIVE_TEMPLATES="config/templates"
-fi
-
-# 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="binary/live"
- ;;
-
- net|usb-hdd|hdd)
- Echo_error "not supported, FIXME"
- ;;
-esac
-
-# Temporary check for broken yaboot
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- case "${LIVE_ARCHITECTURE}" in
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
-fi
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# 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 "${LIVE_INITRAMFS}" in
- casper)
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
- ;;
-
- live-initramfs)
- if [ "${LIVE_HOSTNAME}" != "debian" ]
- then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
- fi
- ;;
- esac
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
- LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- else
- LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- fi
- else
- if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
- then
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- else
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
- fi
- fi
- done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-case "${LIVE_BINARY_IMAGES}" in
- iso)
- # Copying yaboot
- mkdir -p binary/install
- cp chroot/usr/lib/yaboot/yaboot binary/install
- 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}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/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
-
- # Working arround yaboot 8.3 limitation
- if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- NUMBER=$(($NUMBER + 1))
-
- mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
- mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
- sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
- done
- else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
- fi
- ;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot
Copied: releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot (from rev 1940, dists/trunk/live-helper/helpers/lh_binary_yaboot)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_binary_yaboot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,229 @@
+#!/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 lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
+then
+ Echo_warning "skipping binary_yaboot, foreign architecture."
+ exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+ if [ -d ../"${LIVE_TEMPLATES}" ]
+ then
+ LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+ else
+ Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+ exit 1
+ fi
+fi
+
+# Checking local templates
+if [ -d config/templates/yaboot ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
+# 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="binary/live"
+ ;;
+
+ net|usb-hdd|hdd)
+ Echo_error "not supported, FIXME"
+ ;;
+esac
+
+# Temporary check for broken yaboot
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ case "${LIVE_ARCHITECTURE}" in
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ ;;
+ esac
+fi
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# 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 "${LIVE_INITRAMFS}" in
+ casper)
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+ ;;
+
+ live-initramfs)
+ if [ "${LIVE_HOSTNAME}" != "debian" ]
+ then
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ fi
+ ;;
+ esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+ LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\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/vmlinuz*
+ do
+ if [ -z "${LINUX}" ]
+ then
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ else
+ LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ fi
+ else
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ else
+ LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+ fi
+ fi
+ done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+case "${LIVE_BINARY_IMAGES}" in
+ iso)
+ # Copying yaboot
+ mkdir -p binary/install
+ cp chroot/usr/lib/yaboot/yaboot binary/install
+ 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}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/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
+
+ # Working arround yaboot 8.3 limitation
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ NUMBER=$(($NUMBER + 1))
+
+ mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
+ mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
+ sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+ done
+ else
+ mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
+ mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
+ sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+ fi
+ ;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_bootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap(1) - bootstrap a Debian system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="bootstrap a Debian system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-# Bootstrapping system
-lh_bootstrap_cdebootstrap ${*}
-lh_bootstrap_debootstrap ${*}
Copied: releases/live-helper/1.0~a13-1/helpers/lh_bootstrap (from rev 1940, dists/trunk/live-helper/helpers/lh_bootstrap)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_bootstrap (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_bootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# lh_bootstrap(1) - bootstrap a Debian system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="bootstrap a Debian system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+# Bootstrapping system
+lh_bootstrap_cdebootstrap ${*}
+lh_bootstrap_debootstrap ${*}
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,190 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="bootstrap a Debian system with cdebootstrap(1)"
-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 [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
-then
- exit 0
-fi
-
-Echo_message "Begin bootstrapping system..."
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting cdebootstrap options
-if [ -n "${LIVE_ARCHITECTURE}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_ARCHITECTURE}"
-fi
-
-if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
-fi
-
-if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
-fi
-
-if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-else
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-fi
-
-if [ "${LH_DEBUG}" = "true" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
-fi
-
-if [ "${LH_QUIET}" = "true" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
-fi
-
-if [ "${LH_VERBOSE}" = "true" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ -x "/usr/bin/cdebootstrap" ]
-then
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
- then
- # Restore old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
- done
-
- if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
- then
- if [ -d cache/packages_bootstrap ]
- then
- mkdir -p chroot/var/cache/bootstrap
- cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
- fi
-
- # Executing cdebootstrap (download-only)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Removing old cache
- if [ -d cache/packages_bootstrap ]
- then
- rm -f cache/packages_bootstrap/*.deb
- fi
-
- # Saving new cache
- mkdir -p cache/packages_bootstrap
-
- cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
- fi
-
- # Executing cdebootstrap (regular run)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
- if [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "mini" ]
- then
- Chroot "dpkg -P cdebootstrap-helper-diverts"
- fi
-
- # Deconfiguring cdebootstrap configurations
- rm -f chroot/etc/apt/sources.list
- rm -f chroot/etc/hosts
- rm -f chroot/etc/resolv.conf
-
- # Removing bootstrap cache
- rm -rf chroot/var/cache/bootstrap
-
- # Saving new cache
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ]
- then
- if [ -d cache/stages_bootstrap ]
- then
- rm -rf cache/stages_bootstrap
- fi
-
- mkdir -p cache
-
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
- fi
- fi
- done
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-else
- Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
- exit 1
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap (from rev 1940, dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_cdebootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,192 @@
+#!/bin/sh
+
+# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
+# 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="bootstrap a Debian system with cdebootstrap(1)"
+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 [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Creating chroot directory
+mkdir -p chroot
+
+# Setting cdebootstrap options
+if [ -n "${LIVE_ARCHITECTURE}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_ARCHITECTURE}"
+fi
+
+if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
+fi
+
+if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
+fi
+
+if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
+else
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+fi
+
+if [ "${LH_DEBUG}" = "true" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
+fi
+
+if [ "${LH_QUIET}" = "true" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
+fi
+
+if [ "${LH_VERBOSE}" = "true" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
+fi
+
+if [ -x "/usr/bin/cdebootstrap" ]
+then
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
+ then
+ # Restore old cache
+ ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+
+ exit 0
+ fi
+ done
+
+ if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+ then
+ if [ -d cache/packages_bootstrap ]
+ then
+ mkdir -p chroot/var/cache/bootstrap
+ cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
+ fi
+
+ # Executing cdebootstrap (download-only)
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Removing old cache
+ if [ -d cache/packages_bootstrap ]
+ then
+ rm -f cache/packages_bootstrap/*.deb
+ fi
+
+ # Saving new cache
+ mkdir -p cache/packages_bootstrap
+
+ cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
+ fi
+
+ # Executing cdebootstrap (regular run)
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
+ if [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "mini" ]
+ then
+ Chroot "dpkg -P cdebootstrap-helper-diverts"
+ fi
+
+ # Deconfiguring cdebootstrap configurations
+ rm -f chroot/etc/apt/sources.list
+ rm -f chroot/etc/hosts
+ rm -f chroot/etc/resolv.conf
+
+ # Removing bootstrap cache
+ rm -rf chroot/var/cache/bootstrap
+
+ # Saving new cache
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ]
+ then
+ if [ -d cache/stages_bootstrap ]
+ then
+ rm -rf cache/stages_bootstrap
+ fi
+
+ mkdir -p cache
+
+ ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
+ fi
+ fi
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+else
+ Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
+ exit 1
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="bootstrap a Debian system with debootstrap(8)"
-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 [ "${LH_BOOTSTRAP}" != "debootstrap" ]
-then
- exit 0
-fi
-
-Echo_message "Begin bootstrapping system..."
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting debootstrap options
-if [ -n "${LIVE_ARCHITECTURE}" ]
-then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LIVE_ARCHITECTURE}"
-fi
-
-if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
-then
- LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
-fi
-
-if [ "${LH_VERBOSE}" = "true" ]
-then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ -x "/usr/sbin/debootstrap" ]
-then
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
- then
- # Restore old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
- done
-
- if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
- then
- if [ -d cache/packages_bootstrap ]
- then
- mkdir -p chroot/var/cache/apt/archives
- cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
- fi
-
- # Executing debootstrap (download-only)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Removing old cache
- if [ -d cache/packages_bootstrap ]
- then
- rm -f cache/packages_bootstrap/*.deb
- fi
-
- # Saving new cache
- mkdir -p cache/packages_bootstrap
-
- cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
- fi
-
- # Executing debootstrap (regular run)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Removing bootstrap cache
- rm -f chroot/var/cache/apt/archives/*.deb
-
- # Saving new cache
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ]
- then
- if [ -d cache/stages_bootstrap ]
- then
- rm -rf cache/stages_bootstrap
- fi
-
- mkdir -p cache
-
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
- fi
- fi
- done
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-else
- Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
- exit 1
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap (from rev 1940, dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_bootstrap_debootstrap 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,159 @@
+#!/bin/sh
+
+# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
+# 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="bootstrap a Debian system with debootstrap(8)"
+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 [ "${LH_BOOTSTRAP}" != "debootstrap" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Creating chroot directory
+mkdir -p chroot
+
+# Setting debootstrap options
+if [ -n "${LIVE_ARCHITECTURE}" ]
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LIVE_ARCHITECTURE}"
+fi
+
+if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
+then
+ LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
+fi
+
+if [ "${LH_VERBOSE}" = "true" ]
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
+fi
+
+if [ -x "/usr/sbin/debootstrap" ]
+then
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
+ then
+ # Restore old cache
+ ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+
+ exit 0
+ fi
+ done
+
+ if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+ then
+ if [ -d cache/packages_bootstrap ]
+ then
+ mkdir -p chroot/var/cache/apt/archives
+ cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
+ fi
+
+ # Executing debootstrap (download-only)
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Removing old cache
+ if [ -d cache/packages_bootstrap ]
+ then
+ rm -f cache/packages_bootstrap/*.deb
+ fi
+
+ # Saving new cache
+ mkdir -p cache/packages_bootstrap
+
+ cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
+ fi
+
+ # Executing debootstrap (regular run)
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+ fi
+
+ # Removing bootstrap cache
+ rm -f chroot/var/cache/apt/archives/*.deb
+
+ # Saving new cache
+ for STAGE in ${LH_CACHE_STAGES}
+ do
+ if [ "${STAGE}" = "bootstrap" ]
+ then
+ if [ -d cache/stages_bootstrap ]
+ then
+ rm -rf cache/stages_bootstrap
+ fi
+
+ mkdir -p cache
+
+ ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+
+ if [ -n "${LH_ROOT_COMMAND}" ]
+ then
+ ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
+ fi
+ fi
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap
+else
+ Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
+ exit 1
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_build
===================================================================
--- dists/trunk/live-helper/helpers/lh_build 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_build 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# lh_build(1) - build a Debian Live system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="build a Debian Live system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Bootstrapping system
-lh_bootstrap ${*}
-
-# Customizing chroot
-lh_chroot ${*}
-
-# Building binary images
-lh_binary ${*}
-
-# Building source images
-lh_source ${*}
Copied: releases/live-helper/1.0~a13-1/helpers/lh_build (from rev 1940, dists/trunk/live-helper/helpers/lh_build)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_build (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_build 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# lh_build(1) - build a Debian Live system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="build a Debian Live system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Bootstrapping system
+lh_bootstrap ${*}
+
+# Customizing chroot
+lh_chroot ${*}
+
+# Building binary images
+lh_binary ${*}
+
+# Building source images
+lh_source ${*}
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# lh_chroot(1) - customize the Debian system
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="customize the Debian system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-# Configuring chroot
-lh_chroot_proc install ${*}
-lh_chroot_sysfs install ${*}
-lh_chroot_debianchroot install ${*}
-lh_chroot_sysvrc install ${*}
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_apt install ${*}
-lh_chroot_sources install ${*}
-lh_chroot_linux-image install ${*}
-
-# Customizing chroot
-lh_chroot_preseed ${*}
-lh_chroot_tasks ${*}
-lh_chroot_packageslists ${*}
-lh_chroot_packages ${*}
-lh_chroot_local-packageslists ${*}
-lh_chroot_local-packages ${*}
-lh_chroot_localization ${*}
-lh_chroot_local-includes ${*}
-lh_chroot_sysvinit ${*}
-lh_chroot_hooks ${*}
-lh_chroot_local-hooks ${*}
-lh_chroot_symlinks ${*}
-lh_chroot_hacks ${*}
-lh_chroot_interactive ${*}
-
-# Deconfiguring chroot
-lh_chroot_linux-image remove ${*}
-lh_chroot_sources remove ${*}
-lh_chroot_apt remove ${*}
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
-lh_chroot_sysvrc remove ${*}
-lh_chroot_debianchroot remove ${*}
-lh_chroot_sysfs remove ${*}
-lh_chroot_proc remove ${*}
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# lh_chroot(1) - customize the Debian system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="customize the Debian system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+# Configuring chroot
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_debianchroot install ${*}
+lh_chroot_sysvrc install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_apt install ${*}
+lh_chroot_sources install ${*}
+lh_chroot_linux-image install ${*}
+
+# Customizing chroot
+lh_chroot_preseed ${*}
+lh_chroot_tasks ${*}
+lh_chroot_packageslists ${*}
+lh_chroot_packages ${*}
+lh_chroot_local-packageslists ${*}
+lh_chroot_local-packages ${*}
+lh_chroot_localization ${*}
+lh_chroot_local-includes ${*}
+lh_chroot_sysvinit ${*}
+lh_chroot_hooks ${*}
+lh_chroot_local-hooks ${*}
+lh_chroot_symlinks ${*}
+lh_chroot_hacks ${*}
+lh_chroot_interactive ${*}
+
+# Deconfiguring chroot
+lh_chroot_linux-image remove ${*}
+lh_chroot_sources remove ${*}
+lh_chroot_apt remove ${*}
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysvrc remove ${*}
+lh_chroot_debianchroot remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_apt(1) - manage /etc/apt/apt.conf
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/apt/apt.conf"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/apt/apt.conf"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_apt
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- mkdir -p chroot/etc/apt/apt.conf.d
-
- # Configuring apt ftp proxy
- if [ -n "${LH_APT_FTPPROXY}" ]
- then
- echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
- fi
-
- # Configuring apt http proxy
- if [ -n "${LH_APT_HTTPPROXY}" ]
- then
- echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
- fi
-
- # Configuring apt pdiffs
- case "${LH_APT_PDIFFS}" in
- enabled)
- echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
- ;;
-
- disabled)
- echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
- ;;
- esac
-
- # Configuring apt pipeline
- if [ -n "${LH_APT_PIPELINE}" ]
- then
- echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
- fi
-
- # Configuring apt recommends
- if [ "${LH_APT}" = "aptitude" ]
- then
- case "${LH_APT_RECOMMENDS}" in
- enabled)
- echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
- ;;
-
- disabled)
- echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
- ;;
- esac
- fi
-
- # Configuring apt secure
- case "${LH_APT_SECURE}" in
- enabled)
- echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
- echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
- ;;
-
- disabled)
- echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
- echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
- ;;
- esac
-
- # Creating stage file
- Create_stagefile .stage/chroot_apt
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Deconfiguring aptitude ftp proxy
- rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
-
- # Deconfiguring aptitude http proxy
- rm -f chroot/etc/apt/apt.conf.d/00http-proxy
-
- # Deconfiguring aptitude pdiffs
- rm -f chroot/etc/apt/apt.conf.d/00pdiffs
-
- # Deconfiguring aptitude pipeline
- rm -f chroot/etc/apt/apt.conf.d/00pipeline
-
- # Deconfiguring aptitude recommends
- rm -f chroot/etc/apt/apt.conf.d/00recommends
-
- # Deconfiguring aptitude secure
- rm -f chroot/etc/apt/apt.conf.d/00secure
-
- # Removing stage file
- rm -f .stage/chroot_apt
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_apt)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_apt 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# lh_chroot_apt(1) - manage /etc/apt/apt.conf
+# 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="manage /etc/apt/apt.conf"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/apt/apt.conf"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_apt
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ mkdir -p chroot/etc/apt/apt.conf.d
+
+ # Configuring apt ftp proxy
+ if [ -n "${LH_APT_FTPPROXY}" ]
+ then
+ echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
+ fi
+
+ # Configuring apt http proxy
+ if [ -n "${LH_APT_HTTPPROXY}" ]
+ then
+ echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
+ fi
+
+ # Configuring apt pdiffs
+ case "${LH_APT_PDIFFS}" in
+ enabled)
+ echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+ ;;
+
+ disabled)
+ echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+ ;;
+ esac
+
+ # Configuring apt pipeline
+ if [ -n "${LH_APT_PIPELINE}" ]
+ then
+ echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+ fi
+
+ # Configuring apt recommends
+ if [ "${LH_APT}" = "aptitude" ]
+ then
+ case "${LH_APT_RECOMMENDS}" in
+ enabled)
+ echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
+ ;;
+
+ disabled)
+ echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
+ ;;
+ esac
+ fi
+
+ # Configuring apt secure
+ case "${LH_APT_SECURE}" in
+ enabled)
+ echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
+ echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
+ ;;
+
+ disabled)
+ echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
+ echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
+ ;;
+ esac
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_apt
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Deconfiguring aptitude ftp proxy
+ rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
+
+ # Deconfiguring aptitude http proxy
+ rm -f chroot/etc/apt/apt.conf.d/00http-proxy
+
+ # Deconfiguring aptitude pdiffs
+ rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+
+ # Deconfiguring aptitude pipeline
+ rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
+ # Deconfiguring aptitude recommends
+ rm -f chroot/etc/apt/apt.conf.d/00recommends
+
+ # Deconfiguring aptitude secure
+ rm -f chroot/etc/apt/apt.conf.d/00secure
+
+ # Removing stage file
+ rm -f .stage/chroot_apt
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/debian_chroot"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/debian_chroot"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_debianchroot
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/debian_chroot ]
- then
- # Save chroot file
- mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig
- fi
-
- # Create chroot file
- echo "live" > chroot/etc/debian_chroot
-
- # Creating stage file
- Create_stagefile .stage/chroot_debianchroot
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/debian_chroot.orig ]
- then
- # Restore chroot file
- mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot
- else
- # Remove chroot file
- rm -f chroot/etc/debian_chroot
- fi
-
- # Removing stage file
- rm -f .stage/chroot_debianchroot
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_debianchroot)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_debianchroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
+# 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="manage /etc/debian_chroot"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/debian_chroot"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_debianchroot
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/debian_chroot ]
+ then
+ # Save chroot file
+ mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig
+ fi
+
+ # Create chroot file
+ echo "live" > chroot/etc/debian_chroot
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_debianchroot
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/debian_chroot.orig ]
+ then
+ # Restore chroot file
+ mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot
+ else
+ # Remove chroot file
+ rm -f chroot/etc/debian_chroot
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_debianchroot
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hacks(1) - execute hacks in chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="execute hacks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing hacks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hacks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing udev mac caching rule
-Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
-
-case "${LIVE_BINARY_IMAGES}" in
- net)
- if [ ! -f chroot/usr/bin/smbmount ]
- then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes smbfs"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes smbfs"
- ;;
- esac
- fi
-
- if [ ! -d chroot/etc/initramfs-tools ]
- then
- mkdir chroot/etc/initramfs-tools
- fi
- if [ ! "`grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf`" ]
- then
- # Configuring initramfs for NFS
-cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
-MODULES=netboot
-BOOT=nfs
-NFSROOT=auto
-EOF
- fi
- ;;
-esac
-
-# Update initramfs
-Chroot "update-initramfs -k all -t -u"
-
-if [ -n "${LH_ROOT_COMMAND}" ]
-then
- ${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/chroot_hacks
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_hacks)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_hacks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# lh_chroot_hacks(1) - execute hacks in chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute hacks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing hacks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hacks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing udev mac caching rule
+Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
+
+case "${LIVE_BINARY_IMAGES}" in
+ net)
+ if [ ! -f chroot/usr/bin/smbmount ]
+ then
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes smbfs"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes smbfs"
+ ;;
+ esac
+ fi
+
+ if [ ! -d chroot/etc/initramfs-tools ]
+ then
+ mkdir chroot/etc/initramfs-tools
+ fi
+ if [ ! "`grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf`" ]
+ then
+ # Configuring initramfs for NFS
+cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
+MODULES=netboot
+BOOT=nfs
+NFSROOT=auto
+EOF
+ fi
+ ;;
+esac
+
+# Update initramfs
+Chroot "update-initramfs -k all -t -u"
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+ ${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/chroot_hacks
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hooks(1) - execute hooks in chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="execute hooks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing hooks
-for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
-do
- if [ -f ${LH_BASE-:/usr/share/live-helper}/hooks/"${HOOK}" ]
- then
- # Copying hook
- cp ${LH_BASE-:/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
-
- # Making hook executable
- if [ ! -x chroot/root/"${HOOK}" ]
- then
- chmod +x chroot/root/"${HOOK}"
- fi
-
- # Executing hook
- Chroot "/root/${HOOK}"
-
- # Removing hook
- rm -f chroot/root/"${HOOK}"
-
- # Creating stage file
- Create_stagefile .stage/chroot_hooks
- fi
-done
-
-if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
-then
- LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_hooks)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# lh_chroot_hooks(1) - execute hooks in chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute hooks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing hooks
+for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+do
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
+ then
+ # Copying hook
+ cp ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
+
+ # Making hook executable
+ if [ ! -x chroot/root/"${HOOK}" ]
+ then
+ chmod +x chroot/root/"${HOOK}"
+ fi
+
+ # Executing hook
+ Chroot "/root/${HOOK}"
+
+ # Removing hook
+ rm -f chroot/root/"${HOOK}"
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_hooks
+ fi
+done
+
+if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
+then
+ LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hosts(1) - manage /etc/hosts
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/hosts"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/hosts"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_hosts
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/hosts ]
- then
- # Save hosts file
- cp chroot/etc/hosts chroot/etc/hosts.orig
- fi
-
- if [ -f /etc/hosts ]
- then
- # Copy hosts file
- cp /etc/hosts chroot/etc/hosts
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_hosts
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/hosts.orig ]
- then
- # Restore hosts file
- mv chroot/etc/hosts.orig chroot/etc/hosts
- else
- # Remove hosts file
- rm -f chroot/etc/hosts
- fi
-
- # Removing stage file
- rm -f .stage/chroot_hosts
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_hosts)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_hosts 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_hosts(1) - manage /etc/hosts
+# 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="manage /etc/hosts"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/hosts"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_hosts
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/hosts ]
+ then
+ # Save hosts file
+ cp chroot/etc/hosts chroot/etc/hosts.orig
+ fi
+
+ if [ -f /etc/hosts ]
+ then
+ # Copy hosts file
+ cp /etc/hosts chroot/etc/hosts
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_hosts
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/hosts.orig ]
+ then
+ # Restore hosts file
+ mv chroot/etc/hosts.orig chroot/etc/hosts
+ else
+ # Remove hosts file
+ rm -f chroot/etc/hosts
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_hosts
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_interactive(1) - make build interactive
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="make build interactive"
-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_INTERACTIVE}" = "disabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin interactive build..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_interactive
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LIVE_INTERACTIVE}" in
- enabled|shell)
- echo "Pausing build: starting interactive shell..."
- Chroot "/bin/bash --login"
- ;;
- x11)
- echo "Pausing build: starting interactive X11..."
- Chroot "startx"
- ;;
- xnest)
- echo "Pausing build: starting interactive Xnest..."
- #Chroot "" # FIXME
- ;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_interactive)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_interactive 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_chroot_interactive(1) - make build interactive
+# 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="make build interactive"
+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_INTERACTIVE}" = "disabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin interactive build..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_interactive
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LIVE_INTERACTIVE}" in
+ enabled|shell)
+ echo "Pausing build: starting interactive shell..."
+ Chroot "/bin/bash --login"
+ ;;
+ x11)
+ echo "Pausing build: starting interactive X11..."
+ Chroot "startx"
+ ;;
+ xnest)
+ echo "Pausing build: starting interactive Xnest..."
+ #Chroot "" # FIXME
+ ;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linux-image 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/kernel-img.conf"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/kernel-img.conf"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_linux-image
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/kernel-img.conf ]
- then
- # Saving kernel-img.conf
- cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old
- fi
-
- # Configuring kernel-img.conf
-cat >> chroot/etc/kernel-img.conf << EOF
-do_bootloader = No
-do_initrd = Yes
-warn_initrd = No
-EOF
-
- if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
- then
- for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
- do
- for PACKAGE in ${LIVE_LINUX_PACKAGES}
- do
- PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}"
- done
- done
- fi
-
- PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
-
- # Installing linux-image, modules and ${LH_INITRAMFS}
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-
- # Creating stage file
- Create_stagefile .stage/chroot_linux-image
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/kernel-img.conf.old ]
- then
- # Restoring kernel-img.conf file
- mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
- else
- # Removing kernel-img.conf file
- rm -f chroot/etc/kernel-img.conf
- fi
-
- # Removing stage file
- rm -f .stage/chroot_linux-image
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_linux-image)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_linux-image 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
+# 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="manage /etc/kernel-img.conf"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/kernel-img.conf"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_linux-image
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/kernel-img.conf ]
+ then
+ # Saving kernel-img.conf
+ cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old
+ fi
+
+ # Configuring kernel-img.conf
+cat >> chroot/etc/kernel-img.conf << EOF
+do_bootloader = No
+do_initrd = Yes
+warn_initrd = No
+EOF
+
+ if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
+ then
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+ do
+ for PACKAGE in ${LIVE_LINUX_PACKAGES}
+ do
+ PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}"
+ done
+ done
+ fi
+
+ PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
+
+ # Installing linux-image, modules and ${LH_INITRAMFS}
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes ${PACKAGES}"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes ${PACKAGES}"
+ ;;
+ esac
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_linux-image
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/kernel-img.conf.old ]
+ then
+ # Restoring kernel-img.conf file
+ mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
+ else
+ # Removing kernel-img.conf file
+ rm -f chroot/etc/kernel-img.conf
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_linux-image
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-hooks(1) - execute local hooks in chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="execute local hooks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing local hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing local-hooks
-if ls config/chroot_local-hooks/* > /dev/null 2>&1
-then
- for HOOK in config/chroot_local-hooks/*
- do
- # Copying hook
- cp "${HOOK}" chroot/root
-
- # Making hook executable
- if [ ! -x chroot/root/"`basename ${HOOK}`" ]
- then
- chmod +x chroot/root/"`basename ${HOOK}`"
- fi
-
- # Executing hook
- Chroot "/root/`basename ${HOOK}`"
-
- # Removing hook
- rm -f chroot/root/"`basename ${HOOK}`"
- done
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-hooks
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-hooks)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-hooks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# lh_chroot_local-hooks(1) - execute local hooks in chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute local hooks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing local hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing local-hooks
+if ls config/chroot_local-hooks/* > /dev/null 2>&1
+then
+ for HOOK in config/chroot_local-hooks/*
+ do
+ # Copying hook
+ cp "${HOOK}" chroot/root
+
+ # Making hook executable
+ if [ ! -x chroot/root/"`basename ${HOOK}`" ]
+ then
+ chmod +x chroot/root/"`basename ${HOOK}`"
+ fi
+
+ # Executing hook
+ Chroot "/root/`basename ${HOOK}`"
+
+ # Removing hook
+ rm -f chroot/root/"`basename ${HOOK}`"
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-hooks
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-includes(1) - copy local files into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="copy local files into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin copying chroot local includes..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-includes/* > /dev/null 2>&1
-then
- # Copying includes
- cd config/chroot_local-includes
- find . | cpio -dmpu "${OLDPWD}"/chroot
- cd "${OLDPWD}"
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-includes
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-includes)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-includes 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# lh_chroot_local-includes(1) - copy local files into chroot
+# 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 local files into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin copying chroot local includes..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-includes/* > /dev/null 2>&1
+then
+ # Copying includes
+ cd config/chroot_local-includes
+ find . | cpio -dmpu "${OLDPWD}"/chroot
+ cd "${OLDPWD}"
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-includes
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packages(1) - install local packages into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install local packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing local packages..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-packages/*.deb > /dev/null 2>&1
-then
- # Restoring cache
- Restore_cache cache/packages_local-packages
-
- # Copying packages
- cp config/chroot_local-packages/*.deb chroot/root
-
- # Installing packages
- Chroot "find /root -name *.deb" > chroot/root/local-packages
- Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
-
- # Cleaning dependencies
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install -f --yes"
- ;;
-
- aptitude)
- Chroot "aptitude install -f --assume-yes"
- ;;
- esac
-
- # Removing package files
- rm -f chroot/root/*.deb
- rm -f chroot/root/local-packages
-
- # Saving cache
- Save_cache cache/packages_local-packages
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-packages
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-packages)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# lh_chroot_local-packages(1) - install local packages into chroot
+# 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 local packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing local packages..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packages/*.deb > /dev/null 2>&1
+then
+ # Restoring cache
+ Restore_cache cache/packages_local-packages
+
+ # Copying packages
+ cp config/chroot_local-packages/*.deb chroot/root
+
+ # Installing packages
+ Chroot "find /root -name *.deb" > chroot/root/local-packages
+ Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
+
+ # Cleaning dependencies
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install -f --yes"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install -f --assume-yes"
+ ;;
+ esac
+
+ # Removing package files
+ rm -f chroot/root/*.deb
+ rm -f chroot/root/local-packages
+
+ # Saving cache
+ Save_cache cache/packages_local-packages
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-packages
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packageslists(1) - install local packages lists into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install local packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing local packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-packageslists/* > /dev/null 2>&1
-then
- # Restoring cache
- Restore_cache cache/packages_local-packageslists
-
- for PACKAGESLIST in config/chroot_local-packageslists/*
- do
- # Copying package list
- grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
-
- # Installing package list
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes"
- ;;
-
- aptitude)
- Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes"
- ;;
- esac
-
- # Removing package list
- rm -f chroot/root/"`basename ${PACKAGESLIST}`"
- done
-
- # Saving cache
- Save_cache cache/packages_local-packageslists
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-packageslists
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_local-packageslists)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_local-packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# lh_chroot_local-packageslists(1) - install local packages lists into chroot
+# 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 local packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing local packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packageslists/* > /dev/null 2>&1
+then
+ # Restoring cache
+ Restore_cache cache/packages_local-packageslists
+
+ for PACKAGESLIST in config/chroot_local-packageslists/*
+ do
+ # Copying package list
+ grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
+
+ # Installing package list
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes"
+ ;;
+
+ aptitude)
+ Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes"
+ ;;
+ esac
+
+ # Removing package list
+ rm -f chroot/root/"`basename ${PACKAGESLIST}`"
+ done
+
+ # Saving cache
+ Save_cache cache/packages_local-packageslists
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-packageslists
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,650 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localization(1) - install localization packages into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install localization packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing localization packages..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localization
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting localizations
-if [ -n "${LIVE_LANGUAGE}" ]
-then
- case "${LIVE_LANGUAGE}" in
- af)
- # Afrikaans
- LOCALIZATIONS="iceweasel kde openoffice"
- ;;
-
- as-in)
- # Assamese
- LOCALIZATIONS="openoffice"
- ;;
-
- ar)
- # Arabic
- LOCALIZATIONS="iceweasel kde openoffice"
- ;;
-
- az)
- # Azerbaijani
- LOCALIZATIONS="kde"
- ;;
-
- be)
- # Belarusian
- LOCALIZATIONS="iceape iceweasel openoffice"
-
- # Overrides
- OPENOFFICE="be-by"
- ;;
-
- bg)
- # Bulgarian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- bn)
- # Bengali
- LOCALIZATIONS="kde openoffice"
- ;;
-
- br)
- # Breton
- LOCALIZATIONS="kde openoffice"
- ;;
-
- bs)
- # Bosnian
- LOCALIZATION="kde openoffice"
- ;;
-
- ca)
- # Catalan
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- cs)
- # Czech
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- cy-gb)
- # Welsh
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="cy"
- KOFFICE="cy"
- OPENOFFICE="cy"
- ;;
-
- da)
- # Danish
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- de)
- # German
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- dz-bt)
- # Dzongkha
- LOCALIZATIONS="iceweasel openoffice"
-
- # Overrides
- OPENOFFICE="dz"
- ;;
-
- el)
- # Greek
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- en-gb)
- # English (Great Britain)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="engb"
- KOFFICE="engb"
- ;;
-
- en-za)
- # English (South Africa)
- LOCALIZATIONS="openoffice"
- ;;
-
- eo)
- # Esperanto
- LOCALIZATIONS="kde openoffice"
- ;;
-
- es-ar)
- # Spanish (Argentina)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="es"
- KOFFICE="es"
- OPENOFFICE="es"
- ;;
-
- es-es)
- # Spanish (Spain)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="es"
- KOFFICE="es"
- OPENOFFICE="es"
- ;;
-
- et-ee)
- # Estonian
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="et"
- KOFFICE="et"
- OPENOFFICE="et"
- ;;
-
- eu)
- # Basque
- LOCALIZATIONS="icedove iceweasel kde koffice"
- ;;
-
- fa-ir)
- # Persian
- LOCALIZATIONS="iceweasel kde openoffice"
-
- # Overrides
- KDE="fa"
- OPENOFFICE="fa"
- ;;
-
- fi)
- # Finnish
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- fr)
- # French
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- fur-it)
- # Furlan
- LOCALIZATIONS="iceweasel"
- ;;
-
- fy-nl)
- # Frisian
- LOCALIZATIONS="iceweasel kde"
-
- # Overrides
- KDE="fy"
- ;;
-
- ga-ie)
- # Irish (Ireland)
- LOCALIZATIONS="icedove iceweasel kde openoffice"
-
- # Overrides
- ICEDOVE="ga"
- KDE="ga"
- OPENOFFICE="ga"
- ;;
-
- gl)
- # Galician
- LOCALIZATIONS="kde"
- ;;
-
- gu-in)
- # Gujarati (India)
- LOCALIZATIONS="icedove iceweasel openoffice"
-
- # Overrides
- ICEDOVE="gu"
- ;;
-
- he)
- # Hebrew
- LOCALIZATIONS="iceape icedove iceweasel kde openoffice"
- ;;
-
- hi)
- # Hindi
- LOCALIZATIONS="kde openoffice"
- ;;
-
- hr)
- # Croatian
- LOCALIZATIONS="kde koffice openoffice"
- ;;
-
- hu)
- # Hungarian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- in)
- # Indic
- LOCALIZATIONS="openoffice"
- ;;
-
- is)
- # Icelandic
- LOCALIZATIONS="kde"
- ;;
-
- it)
- # Italian
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- ja)
- # Japanese
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- ka)
- # Georgian
- LOCALIZATIONS="iceweasel openoffice"
- ;;
-
- km)
- # Khmer
- LOCALIZATIONS="kde openoffice"
- ;;
-
- ko)
- # Korean
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- ku)
- # Kurdish
- LOCALIZATIONS="iceweasel openoffice"
- ;;
-
- lo)
- # Lao
- LOCALIZATIONS="openoffice"
- ;;
-
- lt)
- # Lithuanian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- lv)
- # Latvian
- LOCALIZATIONS="kde koffice openoffice"
- ;;
-
- mk)
- # Macedonian
- LOCALIZATIONS="icedove iceweasel kde openoffice"
- ;;
-
- ml-in)
- # Malayalam
- LOCALIZATIONS="openoffice"
- ;;
-
- mn)
- # Mongolian
- LOCALIZATIONS="iceweasel kde"
- ;;
-
- ms)
- # Malay
- LOCALIZATIONS="kde koffice"
- ;;
-
- nb-no)
- # Bokmaal (Norway)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- ICEDOVE="nb"
- KDE="nb"
- KOFFICE="nb"
- OPENOFFICE="nb"
- ;;
-
- nds)
- # Low Saxon
- LOCALIZATIONS="kde"
- ;;
-
- ne)
- # Nepalese
- LOCALIZATIONS="openoffice"
- ;;
-
- nl)
- # Dutch
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- nn-no)
- # Nynorsk (Norway)
- LOCALIZATIONS="iceweasel kde openoffice"
-
- # Overrides
- KDE="nn"
- OPENOFFICE="nn"
- ;;
-
- nr)
- # Ndebele
- LOCALIZATIONS="openoffice"
- ;;
-
- ns)
- # Northernsotho
- LOCALIZATIONS="openoffice"
- ;;
-
- or-in)
- # Oriya
- LOCALIZATIONS="openoffice"
- ;;
-
- pa-in)
- # Punjabi (India)
- LOCALIZATIONS="icedove iceweasel kde openoffice"
-
- # Overrides
- ICEDOVE="pa"
- KDE="pa"
- ;;
-
- pl)
- # Polish
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- pt-br)
- # Portugese (Brazil)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="ptbr"
- KOFFICE="ptbr"
- ;;
-
- pt-pt)
- # Portugese (Portugal)
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="pt"
- KOFFICE="pt"
- OPENOFFICE="pt"
- ;;
-
- ro)
- # Romanian
- LOCALIZATIONS="iceweasel kde"
- ;;
-
- roa-es-val)
- # Valencian (Spain)
- LOCALIZATIONS="iceweasel"
- ;;
-
- ru)
- # Russian
- LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
- ;;
-
- rw)
- # Kinarwanda
- LOCALIZATIONS="kde openoffice"
- ;;
-
- se)
- # Northern Sami
- LOCALIZATIONS="kde"
- ;;
-
- sk)
- # Slovak
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- sl)
- # Slovenian
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
- ;;
-
- sr-cs)
- # Serbian
- LOCALIZATIONS="kde koffice openoffice"
-
- # Overrides
- KDE="sr"
- KOFFICE="sr"
- ;;
-
- sr-latin)
- # Latin Serbian
- LOCALIZATIONS="kde koffice"
-
- # Overrides
- KDE="srlatin"
- KOFFICE="srlatin"
- ;;
-
- ss)
- # Swazi
- LOCALIZATIONS="kde openoffice"
- ;;
-
- st)
- # Southern_sotho
- LOCALIZATIONS="openoffice"
- ;;
-
- sv-se)
- # Swedish
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- ICEDOVE="sv"
- KDE="sv"
- KOFFICE="sv"
- OPENOFFICE="sv"
- ;;
-
- ta-in)
- # Tamil
- LOCALIZATIONS="kde openoffice"
-
- # Overrides
- KDE="ta"
- ;;
-
- te-in)
- # Telugu
- LOCALIZATIONS="openoffice"
- ;;
-
- tg)
- # Tajik
- LOCALIZATIONS="kde openoffice"
- ;;
-
- th)
- # Thai
- LOCALIZATIONS="openoffice"
- ;;
-
- tn)
- # Tswana
- LOCALIZATIONS="openoffice"
- ;;
-
- tr)
- # Turkish
- LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
- ;;
-
- ts)
- # Tsonga
- LOCALIZATIONS="openoffice"
- ;;
-
- uk-ua)
- # Ukrainian
- LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
-
- # Overrides
- ICEDOVE="uk"
- KDE="uk"
- KDE="uk"
- OPENOFFICE="uk"
- ;;
-
- uz)
- # Uzbek
- LOCALIZATIONS="kde"
- ;;
-
- ve)
- # Venda
- LOCALIZATIONS="openoffice"
- ;;
-
- vi)
- # Vietnamese
- LOCALIZATIONS="openoffice"
- ;;
-
- xh)
- # Xhosa
- LOCALIZATIONS="openoffice"
- ;;
-
- za)
- # South African
- LOCALIZATIONS="openoffice"
- ;;
-
- zh-cn)
- # Chinese (China)
- LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="zhcn"
- KOFFICE="zhcn"
- ;;
-
- zh-tw)
- # Chinese (Taiwan)
- LOCALIZATIONS="iceweasel kde koffice openoffice"
-
- # Overrides
- KDE="zhtw"
- KOFFICE="zhtw"
- ;;
-
- zu)
- # Zulu
- LOCALIZATIONS="openoffice"
- ;;
- esac
-
- # Setting languages
- ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
- ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
- ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
- KDE="${KDE:-$LIVE_LANGUAGE}"
- KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
- OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
-
- # Setting packages
- for LOCALIZATION in ${LOCALIZATIONS}
- do
- case "${LOCALZATION}" in
- iceape)
- Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
- ;;
-
- icedove)
- Check_package chroot/usr/bin/icedove icedove-locale-"${ICEDOVE}"
- ;;
-
- iceweasel)
- Check_package chroot/usr/bin/iceweasel iceweasel-l10n-"${ICEWEASEL}"
- ;;
-
- kde)
- Check_package chroot/usr/bin/kstart kde-i18n-"${KDE}"
- ;;
-
- koffice)
- Check_package chroot/usr/bin/usr/bin/koconverter koffice-i18n-"${KOFFICE}"
- ;;
-
- openoffice)
- Check_package chroot/usr/bin/ooffice openoffice.org-l10n-"${OPENOFFICE}"
- ;;
- esac
- done
-
- # Restoring cache
- Restore_cache cache/packages_localization
-
- # Installing packages
- Install_package
-
- # Saving cache
- Save_cache cache/packages_localization
-
- # Creating stage file
- Create_stagefile .stage/chroot_localization
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_localization)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_localization 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,652 @@
+#!/bin/sh
+
+# lh_chroot_localization(1) - install localization packages into chroot
+# 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 localization packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing localization packages..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_localization
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting localizations
+if [ -n "${LIVE_LANGUAGE}" ]
+then
+ case "${LIVE_LANGUAGE}" in
+ af)
+ # Afrikaans
+ LOCALIZATIONS="iceweasel kde openoffice"
+ ;;
+
+ as-in)
+ # Assamese
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ ar)
+ # Arabic
+ LOCALIZATIONS="iceweasel kde openoffice"
+ ;;
+
+ az)
+ # Azerbaijani
+ LOCALIZATIONS="kde"
+ ;;
+
+ be)
+ # Belarusian
+ LOCALIZATIONS="iceape iceweasel openoffice"
+
+ # Overrides
+ OPENOFFICE="be-by"
+ ;;
+
+ bg)
+ # Bulgarian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ bn)
+ # Bengali
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ br)
+ # Breton
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ bs)
+ # Bosnian
+ LOCALIZATION="kde openoffice"
+ ;;
+
+ ca)
+ # Catalan
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ cs)
+ # Czech
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ cy-gb)
+ # Welsh
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="cy"
+ KOFFICE="cy"
+ OPENOFFICE="cy"
+ ;;
+
+ da)
+ # Danish
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ de)
+ # German
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ dz-bt)
+ # Dzongkha
+ LOCALIZATIONS="iceweasel openoffice"
+
+ # Overrides
+ OPENOFFICE="dz"
+ ;;
+
+ el)
+ # Greek
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ en-gb)
+ # English (Great Britain)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="engb"
+ KOFFICE="engb"
+ ;;
+
+ en-za)
+ # English (South Africa)
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ eo)
+ # Esperanto
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ es-ar)
+ # Spanish (Argentina)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="es"
+ KOFFICE="es"
+ OPENOFFICE="es"
+ ;;
+
+ es-es)
+ # Spanish (Spain)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="es"
+ KOFFICE="es"
+ OPENOFFICE="es"
+ ;;
+
+ et-ee)
+ # Estonian
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="et"
+ KOFFICE="et"
+ OPENOFFICE="et"
+ ;;
+
+ eu)
+ # Basque
+ LOCALIZATIONS="icedove iceweasel kde koffice"
+ ;;
+
+ fa-ir)
+ # Persian
+ LOCALIZATIONS="iceweasel kde openoffice"
+
+ # Overrides
+ KDE="fa"
+ OPENOFFICE="fa"
+ ;;
+
+ fi)
+ # Finnish
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ fr)
+ # French
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ fur-it)
+ # Furlan
+ LOCALIZATIONS="iceweasel"
+ ;;
+
+ fy-nl)
+ # Frisian
+ LOCALIZATIONS="iceweasel kde"
+
+ # Overrides
+ KDE="fy"
+ ;;
+
+ ga-ie)
+ # Irish (Ireland)
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+
+ # Overrides
+ ICEDOVE="ga"
+ KDE="ga"
+ OPENOFFICE="ga"
+ ;;
+
+ gl)
+ # Galician
+ LOCALIZATIONS="kde"
+ ;;
+
+ gu-in)
+ # Gujarati (India)
+ LOCALIZATIONS="icedove iceweasel openoffice"
+
+ # Overrides
+ ICEDOVE="gu"
+ ;;
+
+ he)
+ # Hebrew
+ LOCALIZATIONS="iceape icedove iceweasel kde openoffice"
+ ;;
+
+ hi)
+ # Hindi
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ hr)
+ # Croatian
+ LOCALIZATIONS="kde koffice openoffice"
+ ;;
+
+ hu)
+ # Hungarian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ in)
+ # Indic
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ is)
+ # Icelandic
+ LOCALIZATIONS="kde"
+ ;;
+
+ it)
+ # Italian
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ ja)
+ # Japanese
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ ka)
+ # Georgian
+ LOCALIZATIONS="iceweasel openoffice"
+ ;;
+
+ km)
+ # Khmer
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ ko)
+ # Korean
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ ku)
+ # Kurdish
+ LOCALIZATIONS="iceweasel openoffice"
+ ;;
+
+ lo)
+ # Lao
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ lt)
+ # Lithuanian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ lv)
+ # Latvian
+ LOCALIZATIONS="kde koffice openoffice"
+ ;;
+
+ mk)
+ # Macedonian
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+ ;;
+
+ ml-in)
+ # Malayalam
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ mn)
+ # Mongolian
+ LOCALIZATIONS="iceweasel kde"
+ ;;
+
+ ms)
+ # Malay
+ LOCALIZATIONS="kde koffice"
+ ;;
+
+ nb-no)
+ # Bokmaal (Norway)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ ICEDOVE="nb"
+ KDE="nb"
+ KOFFICE="nb"
+ OPENOFFICE="nb"
+ ;;
+
+ nds)
+ # Low Saxon
+ LOCALIZATIONS="kde"
+ ;;
+
+ ne)
+ # Nepalese
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ nl)
+ # Dutch
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ nn-no)
+ # Nynorsk (Norway)
+ LOCALIZATIONS="iceweasel kde openoffice"
+
+ # Overrides
+ KDE="nn"
+ OPENOFFICE="nn"
+ ;;
+
+ nr)
+ # Ndebele
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ ns)
+ # Northernsotho
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ or-in)
+ # Oriya
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ pa-in)
+ # Punjabi (India)
+ LOCALIZATIONS="icedove iceweasel kde openoffice"
+
+ # Overrides
+ ICEDOVE="pa"
+ KDE="pa"
+ ;;
+
+ pl)
+ # Polish
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ pt-br)
+ # Portugese (Brazil)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="ptbr"
+ KOFFICE="ptbr"
+ ;;
+
+ pt-pt)
+ # Portugese (Portugal)
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="pt"
+ KOFFICE="pt"
+ OPENOFFICE="pt"
+ ;;
+
+ ro)
+ # Romanian
+ LOCALIZATIONS="iceweasel kde"
+ ;;
+
+ roa-es-val)
+ # Valencian (Spain)
+ LOCALIZATIONS="iceweasel"
+ ;;
+
+ ru)
+ # Russian
+ LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+ ;;
+
+ rw)
+ # Kinarwanda
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ se)
+ # Northern Sami
+ LOCALIZATIONS="kde"
+ ;;
+
+ sk)
+ # Slovak
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ sl)
+ # Slovenian
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+ ;;
+
+ sr-cs)
+ # Serbian
+ LOCALIZATIONS="kde koffice openoffice"
+
+ # Overrides
+ KDE="sr"
+ KOFFICE="sr"
+ ;;
+
+ sr-latin)
+ # Latin Serbian
+ LOCALIZATIONS="kde koffice"
+
+ # Overrides
+ KDE="srlatin"
+ KOFFICE="srlatin"
+ ;;
+
+ ss)
+ # Swazi
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ st)
+ # Southern_sotho
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ sv-se)
+ # Swedish
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ ICEDOVE="sv"
+ KDE="sv"
+ KOFFICE="sv"
+ OPENOFFICE="sv"
+ ;;
+
+ ta-in)
+ # Tamil
+ LOCALIZATIONS="kde openoffice"
+
+ # Overrides
+ KDE="ta"
+ ;;
+
+ te-in)
+ # Telugu
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ tg)
+ # Tajik
+ LOCALIZATIONS="kde openoffice"
+ ;;
+
+ th)
+ # Thai
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ tn)
+ # Tswana
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ tr)
+ # Turkish
+ LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
+ ;;
+
+ ts)
+ # Tsonga
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ uk-ua)
+ # Ukrainian
+ LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
+
+ # Overrides
+ ICEDOVE="uk"
+ KDE="uk"
+ KDE="uk"
+ OPENOFFICE="uk"
+ ;;
+
+ uz)
+ # Uzbek
+ LOCALIZATIONS="kde"
+ ;;
+
+ ve)
+ # Venda
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ vi)
+ # Vietnamese
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ xh)
+ # Xhosa
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ za)
+ # South African
+ LOCALIZATIONS="openoffice"
+ ;;
+
+ zh-cn)
+ # Chinese (China)
+ LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="zhcn"
+ KOFFICE="zhcn"
+ ;;
+
+ zh-tw)
+ # Chinese (Taiwan)
+ LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+ # Overrides
+ KDE="zhtw"
+ KOFFICE="zhtw"
+ ;;
+
+ zu)
+ # Zulu
+ LOCALIZATIONS="openoffice"
+ ;;
+ esac
+
+ # Setting languages
+ ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
+ ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
+ ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
+ KDE="${KDE:-$LIVE_LANGUAGE}"
+ KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
+ OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
+
+ # Setting packages
+ for LOCALIZATION in ${LOCALIZATIONS}
+ do
+ case "${LOCALZATION}" in
+ iceape)
+ Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
+ ;;
+
+ icedove)
+ Check_package chroot/usr/bin/icedove icedove-locale-"${ICEDOVE}"
+ ;;
+
+ iceweasel)
+ Check_package chroot/usr/bin/iceweasel iceweasel-l10n-"${ICEWEASEL}"
+ ;;
+
+ kde)
+ Check_package chroot/usr/bin/kstart kde-i18n-"${KDE}"
+ ;;
+
+ koffice)
+ Check_package chroot/usr/bin/usr/bin/koconverter koffice-i18n-"${KOFFICE}"
+ ;;
+
+ openoffice)
+ Check_package chroot/usr/bin/ooffice openoffice.org-l10n-"${OPENOFFICE}"
+ ;;
+ esac
+ done
+
+ # Restoring cache
+ Restore_cache cache/packages_localization
+
+ # Installing packages
+ Install_package
+
+ # Saving cache
+ Save_cache cache/packages_localization
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_localization
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_packages(1) - install packages into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing packages..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
-then
- # Restoring cache
- Restore_cache cache/packages_packages
-
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${LIVE_PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${LIVE_PACKAGES}"
- ;;
- esac
-
- # Saving cache
- Save_cache cache/packages_packages
-
- # Creating stage file
- Create_stagefile .stage/chroot_packages
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_packages)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_packages 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_chroot_packages(1) - install packages into chroot
+# 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 packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing packages..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
+then
+ # Restoring cache
+ Restore_cache cache/packages_packages
+
+ # Installing packages
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install --yes ${LIVE_PACKAGES}"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install --assume-yes ${LIVE_PACKAGES}"
+ ;;
+ esac
+
+ # Saving cache
+ Save_cache cache/packages_packages
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_packages
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_packageslists(1) - install packages lists into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install packages lists into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
-then
- # Restoring cache
- Restore_cache cache/packages_packageslists
-
- for LIST in ${LIVE_PACKAGES_LISTS}
- do
- if [ -f ${LH_BASE-:/usr/share/live-helper}/lists/"${LIST}" ]
- then
- # Copying package list
- grep -v "^#" ${LH_BASE-:/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
-
- # Installing package list
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "xargs --arg-file=/root/${LIST} apt-get install --yes"
- ;;
-
- aptitude)
- Chroot "xargs --arg-file=/root/${LIST} aptitude install --assume-yes"
- ;;
- esac
-
- # Removing package list
- rm -f chroot/root/"${LIST}"
- fi
- done
-
- # Saving cache
- Save_cache cache/packages_packageslists
-
- # Creating stage file
- Create_stagefile .stage/chroot_packageslists
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_packageslists)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_packageslists 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# lh_chroot_packageslists(1) - install packages lists into chroot
+# 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 packages lists into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
+then
+ # Restoring cache
+ Restore_cache cache/packages_packageslists
+
+ for LIST in ${LIVE_PACKAGES_LISTS}
+ do
+ if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
+ then
+ # Copying package list
+ grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
+
+ # Installing package list
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "xargs --arg-file=/root/${LIST} apt-get install --yes"
+ ;;
+
+ aptitude)
+ Chroot "xargs --arg-file=/root/${LIST} aptitude install --assume-yes"
+ ;;
+ esac
+
+ # Removing package list
+ rm -f chroot/root/"${LIST}"
+ fi
+ done
+
+ # Saving cache
+ Save_cache cache/packages_packageslists
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_packageslists
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_preseed(1) - mount /proc
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="execute preseed in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin executing preseed..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_preseed
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_PRESEED}" ]
-then
- if [ -f "${LIVE_PRESEED}" ]
- then
- # Check dependency
- Check_package chroot/usr/bin/debconf-set-selections debconf
-
- # Install dependency
- Install_package
-
- # Copying preseed
- cp "${LIVE_PRESEED}" chroot/root/preseed
-
- Chroot "debconf-set-selections /root/preseed"
-
- # Removing preseed file
- rm -f chroot/root/preseed
-
- # Remove dependency
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/chroot_preseed
- fi
-else
- Echo_error "'${LIVE_PRESEED}' file doesn't exists."
- exit 1
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_preseed)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_preseed 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# lh_chroot_preseed(1) - mount /proc
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute preseed in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing preseed..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_PRESEED}" ]
+then
+ if [ -f "${LIVE_PRESEED}" ]
+ then
+ # Check dependency
+ Check_package chroot/usr/bin/debconf-set-selections debconf
+
+ # Install dependency
+ Install_package
+
+ # Copying preseed
+ cp "${LIVE_PRESEED}" chroot/root/preseed
+
+ Chroot "debconf-set-selections /root/preseed"
+
+ # Removing preseed file
+ rm -f chroot/root/preseed
+
+ # Remove dependency
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_preseed
+ fi
+else
+ Echo_error "'${LIVE_PRESEED}' file doesn't exists."
+ exit 1
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_proc(1) - mount /proc
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="mount /proc"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin mounting /proc..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_proc
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Creating mountpoint
- mkdir -p chroot/proc
-
- # Mounting /proc
- ${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
-
- # Creating stage file
- Create_stagefile .stage/chroot_proc
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Workaround binfmt-support /proc locking
- if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
- then
- ${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
- fi
-
- # Unmounting /proc
- #fuser -km chroot/proc
- ${LH_ROOT_COMMAND} umount chroot/proc > /dev/null 2>&1
-
- # Removing stage file
- rm -f .stage/chroot_proc
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_proc)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_proc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# lh_chroot_proc(1) - mount /proc
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="mount /proc"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin mounting /proc..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_proc
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Creating mountpoint
+ mkdir -p chroot/proc
+
+ # Mounting /proc
+ ${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_proc
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Workaround binfmt-support /proc locking
+ if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
+ then
+ ${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
+ fi
+
+ # Unmounting /proc
+ #fuser -km chroot/proc
+ ${LH_ROOT_COMMAND} umount chroot/proc > /dev/null 2>&1
+
+ # Removing stage file
+ rm -f .stage/chroot_proc
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_resolv(1) - manage /etc/resolv.conf
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/resolv.conf"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/resolv.conf"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_resolv
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/resolv.conf ]
- then
- # Save resolv file
- cp chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
- fi
-
- if [ -f /etc/resolv.conf ]
- then
- # Copy resolv file
- cp /etc/resolv.conf chroot/etc/resolv.conf
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_resolv
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/etc/resolv.conf.orig ]
- then
- # Restore resolv file
- mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
- else
- # Remove resolv file
- rm -f chroot/etc/resolv.conf
- fi
-
- # Removing stage file
- rm -f .stage/chroot_resolv
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_resolv)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_resolv 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_resolv(1) - manage /etc/resolv.conf
+# 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="manage /etc/resolv.conf"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/resolv.conf"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_resolv
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/resolv.conf ]
+ then
+ # Save resolv file
+ cp chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+ fi
+
+ if [ -f /etc/resolv.conf ]
+ then
+ # Copy resolv file
+ cp /etc/resolv.conf chroot/etc/resolv.conf
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_resolv
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/etc/resolv.conf.orig ]
+ then
+ # Restore resolv file
+ mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
+ else
+ # Remove resolv file
+ rm -f chroot/etc/resolv.conf
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_resolv
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,307 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sources(1) - manage /etc/apt/sources.list
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /etc/apt/sources.list"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /etc/apt/sources.list"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_sources
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Configure custom sources.list
- echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
-
- if [ "${LIVE_SECURITY}" = "enabled" ]
- then
- case "${LH_MODE}" in
- debian)
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- ;;
-
- ubuntu)
- echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- ;;
- esac
- fi
-
- # Check local sources.list
- if ls config/chroot_sources/*.bootstrap > /dev/null 2>&1
- then
- echo "" >> chroot/etc/apt/sources.list
- echo "# Custom repositories" >> chroot/etc/apt/sources.list
-
- for FILE in config/chroot_sources/*.bootstrap
- do
- cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
- done
- fi
-
- # Update indices from cache
- if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
- then
- if ls cache/indices_bootstrap/secring.gpg* > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
- fi
-
- if ls cache/indices_bootstrap/trusted.gpg* > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
- fi
-
- if [ -f cache/indices_bootstrap/pkgcache.bin ]
- then
- cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
- fi
-
- if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
- then
- cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
- fi
-
- if ls cache/indices_bootstrap/*_Packages > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
- fi
-
- if ls cache/indices_bootstrap/*_Sources > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
- fi
-
- if ls cache/indices_bootstrap/*_Release* > /dev/null 2>&1
- then
- cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
- fi
-
- if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
- then
- Chroot "apt-get install --yes --force-yes aptitude"
- fi
- else # Get fresh indices
- # Check local gpg keys
- if ls config/chroot_sources/*.bootstrap.gpg > /dev/null 2>&1
- then
- for FILE in config/chroot_sources/*.bootstrap.gpg
- do
- cp ${FILE} chroot/root
- Chroot "apt-key add /root/`basename ${FILE}`"
- rm -f chroot/root/`basename ${FILE}`
- done
- fi
-
- # Check local keyring packages
- if ls config/chroot_sources/*.deb > /dev/null 2>&1
- then
- for PACKAGE in config/chroot_sources/*.deb
- do
- cp ${PACKAGE} chroot/root
- Chroot "dpkg -i `basename ${PACKAGE}`"
- rm -f chroot/root/`basename ${PACKAGE}`
- done
- fi
-
- # Installing aptitude
- if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ]
- then
- Chroot "apt-get update"
- elif [ "${LH_APT}" = "aptitude" ]
- then
- if [ ! -x /usr/bin/aptitude ]
- then
- Chroot "apt-get update"
- Chroot "apt-get install --yes --force-yes aptitude"
- fi
-
- Chroot "aptitude update"
- fi
-
- # Installing keyring packages
- if [ -n "${LIVE_KEYRING_PACKAGES}" ]
- then
- Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}"
- Chroot "apt-get update"
- fi
-
- if [ "${LH_CACHE_INDICES}" = "enabled" ]
- then
- mkdir -p cache/indices_bootstrap
-
- cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
- cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
-
- cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
- cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
-
- cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
- cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
- cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap
- fi
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_sources
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Configure generic indices
- if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
- then
- # Don't do anything if it's not required
- if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
- [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
- then
- exit 0
- fi
-
- # Cleaning apt list cache
- rm -rf chroot/var/lib/apt/lists
- mkdir -p chroot/var/lib/apt/lists/partial
-
- echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
-
- if [ "${LIVE_SECURITY}" = "enabled" ]
- then
- case "${LH_MODE}" in
- debian)
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- ;;
-
- ubuntu)
- echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- ;;
- esac
- fi
-
- # Check local sources.list
- if ls config/chroot_sources/*.binary > /dev/null 2>&1
- then
- echo "" >> chroot/etc/apt/sources.list
- echo "# Custom repositories" >> chroot/etc/apt/sources.list
-
- for FILE in config/chroot_sources/*.binary
- do
- cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
- done
- fi
-
- # Check local gpg keys
- if ls config/chroot_sources/*.binary.gpg > /dev/null 2>&1
- then
- for FILE in config/chroot_sources/*.binary.gpg
- do
- cp ${FILE} chroot/root
- Chroot "apt-key add /root/`basename ${FILE}`"
- rm -f chroot/root/`basename ${FILE}`
- done
- fi
-
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get update"
- ;;
-
- aptitude)
- Chroot "aptitude update"
- ;;
- esac
- fi
-
- # Cleaning apt packages cache
- rm -rf chroot/var/cache/apt
- mkdir -p chroot/var/cache/apt/archives/partial
-
- # Removing old files
- rm -f chroot/var/lib/dpkg/available-old
- rm -f chroot/var/lib/dpkg/diversions-old
- rm -f chroot/var/lib/dpkg/statoverride-old
- rm -f chroot/var/lib/dpkg/status-old
-
- # Removing stage file
- rm -f .stage/chroot_sources
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sources)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sources 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,309 @@
+#!/bin/sh
+
+# lh_chroot_sources(1) - manage /etc/apt/sources.list
+# 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="manage /etc/apt/sources.list"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /etc/apt/sources.list"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_sources
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Configure custom sources.list
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+
+ if [ "${LIVE_SECURITY}" = "enabled" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
+ esac
+ fi
+
+ # Check local sources.list
+ if ls config/chroot_sources/*.bootstrap > /dev/null 2>&1
+ then
+ echo "" >> chroot/etc/apt/sources.list
+ echo "# Custom repositories" >> chroot/etc/apt/sources.list
+
+ for FILE in config/chroot_sources/*.bootstrap
+ do
+ cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
+ done
+ fi
+
+ # Update indices from cache
+ if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
+ then
+ if ls cache/indices_bootstrap/secring.gpg* > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
+ fi
+
+ if ls cache/indices_bootstrap/trusted.gpg* > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
+ fi
+
+ if [ -f cache/indices_bootstrap/pkgcache.bin ]
+ then
+ cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
+ fi
+
+ if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
+ then
+ cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
+ fi
+
+ if ls cache/indices_bootstrap/*_Packages > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
+ fi
+
+ if ls cache/indices_bootstrap/*_Sources > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
+ fi
+
+ if ls cache/indices_bootstrap/*_Release* > /dev/null 2>&1
+ then
+ cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
+ fi
+
+ if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
+ then
+ Chroot "apt-get install --yes --force-yes aptitude"
+ fi
+ else # Get fresh indices
+ # Check local gpg keys
+ if ls config/chroot_sources/*.bootstrap.gpg > /dev/null 2>&1
+ then
+ for FILE in config/chroot_sources/*.bootstrap.gpg
+ do
+ cp ${FILE} chroot/root
+ Chroot "apt-key add /root/`basename ${FILE}`"
+ rm -f chroot/root/`basename ${FILE}`
+ done
+ fi
+
+ # Check local keyring packages
+ if ls config/chroot_sources/*.deb > /dev/null 2>&1
+ then
+ for PACKAGE in config/chroot_sources/*.deb
+ do
+ cp ${PACKAGE} chroot/root
+ Chroot "dpkg -i `basename ${PACKAGE}`"
+ rm -f chroot/root/`basename ${PACKAGE}`
+ done
+ fi
+
+ # Installing aptitude
+ if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ]
+ then
+ Chroot "apt-get update"
+ elif [ "${LH_APT}" = "aptitude" ]
+ then
+ if [ ! -x /usr/bin/aptitude ]
+ then
+ Chroot "apt-get update"
+ Chroot "apt-get install --yes --force-yes aptitude"
+ fi
+
+ Chroot "aptitude update"
+ fi
+
+ # Installing keyring packages
+ if [ -n "${LIVE_KEYRING_PACKAGES}" ]
+ then
+ Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}"
+ Chroot "apt-get update"
+ fi
+
+ if [ "${LH_CACHE_INDICES}" = "enabled" ]
+ then
+ mkdir -p cache/indices_bootstrap
+
+ cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
+ cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
+
+ cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
+ cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
+
+ cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
+ cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
+ cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap
+ fi
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sources
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Configure generic indices
+ if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
+ then
+ # Don't do anything if it's not required
+ if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
+ [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
+ then
+ exit 0
+ fi
+
+ # Cleaning apt list cache
+ rm -rf chroot/var/lib/apt/lists
+ mkdir -p chroot/var/lib/apt/lists/partial
+
+ echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+
+ if [ "${LIVE_SECURITY}" = "enabled" ]
+ then
+ case "${LH_MODE}" in
+ debian)
+ if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LIVE_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
+ esac
+ fi
+
+ # Check local sources.list
+ if ls config/chroot_sources/*.binary > /dev/null 2>&1
+ then
+ echo "" >> chroot/etc/apt/sources.list
+ echo "# Custom repositories" >> chroot/etc/apt/sources.list
+
+ for FILE in config/chroot_sources/*.binary
+ do
+ cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
+ done
+ fi
+
+ # Check local gpg keys
+ if ls config/chroot_sources/*.binary.gpg > /dev/null 2>&1
+ then
+ for FILE in config/chroot_sources/*.binary.gpg
+ do
+ cp ${FILE} chroot/root
+ Chroot "apt-key add /root/`basename ${FILE}`"
+ rm -f chroot/root/`basename ${FILE}`
+ done
+ fi
+
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get update"
+ ;;
+
+ aptitude)
+ Chroot "aptitude update"
+ ;;
+ esac
+ fi
+
+ # Cleaning apt packages cache
+ rm -rf chroot/var/cache/apt
+ mkdir -p chroot/var/cache/apt/archives/partial
+
+ # Removing old files
+ rm -f chroot/var/lib/dpkg/available-old
+ rm -f chroot/var/lib/dpkg/diversions-old
+ rm -f chroot/var/lib/dpkg/statoverride-old
+ rm -f chroot/var/lib/dpkg/status-old
+
+ # Removing stage file
+ rm -f .stage/chroot_sources
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_symlinks(1) - convert symlinks
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="convert symlinks"
-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_SYMLINKS}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin converting symlinks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_symlinks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/symlinks symlinks
-
-# Installing depends
-Install_package
-
-# Converting symlinks
-Chroot "symlinks -c -r -s /"
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_symlinks)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_symlinks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# lh_chroot_symlinks(1) - convert symlinks
+# 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="convert symlinks"
+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_SYMLINKS}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin converting symlinks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_symlinks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/symlinks symlinks
+
+# Installing depends
+Install_package
+
+# Converting symlinks
+Chroot "symlinks -c -r -s /"
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysfs(1) - mount /sys
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="mount /sys"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin mounting /sys..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_sysfs
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Create mountpoint
- mkdir -p chroot/sys
-
- # Mounting /sys
- ${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
-
- # Creating stage file
- Create_stagefile .stage/chroot_sysfs
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Unmounting /sys
- #fuser -km chroot/sys
- ${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
-
- # Removing stage file
- rm -f .stage/chroot_sysfs
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sysfs)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysfs 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# lh_chroot_sysfs(1) - mount /sys
+# 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="mount /sys"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin mounting /sys..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_sysfs
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Create mountpoint
+ mkdir -p chroot/sys
+
+ # Mounting /sys
+ ${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sysfs
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Unmounting /sys
+ #fuser -km chroot/sys
+ ${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
+
+ # Removing stage file
+ rm -f .stage/chroot_sysfs
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysvinit(1) - configure sysvinit
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="configure sysvinit"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring package sysvinit"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_sysvinit
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_SYSVINIT}" = "enabled" ]
-then
- # Disable all
- for FILE in chroot/etc/init.d/*
- do
- Chroot "update-rc.d -f `basename ${FILE}` remove"
- done
-
- # Re-enable all required (taken from -f standard chroot)
- for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
- do
- if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
- then
- # Re-configure if existing
- Chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
- fi
- done
-
- # Creating stage file
- Create_stagefile .stage/chroot_sysvinit
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sysvinit)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvinit 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# lh_chroot_sysvinit(1) - configure sysvinit
+# 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="configure sysvinit"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring package sysvinit"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_sysvinit
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_SYSVINIT}" = "enabled" ]
+then
+ # Disable all
+ for FILE in chroot/etc/init.d/*
+ do
+ Chroot "update-rc.d -f `basename ${FILE}` remove"
+ done
+
+ # Re-enable all required (taken from -f standard chroot)
+ for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
+ do
+ if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
+ then
+ # Re-configure if existing
+ Chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
+ fi
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sysvinit
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysvrc(1) - manage /usr/sbin/policy-rc.d
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="manage /usr/sbin/policy-rc.d"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Configuring file /usr/sbin/policy-rc.d"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-case "${1}" in
- install)
- # Checking stage file
- Check_stagefile .stage/chroot_sysvrc
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/usr/sbin/policy-rc.d ]
- then
- # Save policy-rc.d file
- mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
- fi
-
- # Create policy-rc.d file
-cat > chroot/usr/sbin/policy-rc.d << EOF
-#!/bin/sh
-
-echo
-echo "Warning: invoke-rc.d policy in action. Skiping daemon starting"
-
-exit 101
-EOF
-
- chmod 0755 chroot/usr/sbin/policy-rc.d
-
- # Creating stage file
- Create_stagefile .stage/chroot_sysvrc
- ;;
-
- remove)
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ -f chroot/usr/sbin/policy-rc.d.orig ]
- then
- # Restore policy-rc.d file
- mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
- else
- # Remove policy-rc.d file
- rm -f chroot/usr/sbin/policy-rc.d
- fi
-
- # Removing stage file
- rm -f .stage/chroot_sysvrc
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_sysvrc)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_sysvrc 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# lh_chroot_sysvrc(1) - manage /usr/sbin/policy-rc.d
+# 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="manage /usr/sbin/policy-rc.d"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Configuring file /usr/sbin/policy-rc.d"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+case "${1}" in
+ install)
+ # Checking stage file
+ Check_stagefile .stage/chroot_sysvrc
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/usr/sbin/policy-rc.d ]
+ then
+ # Save policy-rc.d file
+ mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
+ fi
+
+ # Create policy-rc.d file
+cat > chroot/usr/sbin/policy-rc.d << EOF
+#!/bin/sh
+
+echo
+echo "Warning: invoke-rc.d policy in action. Skiping daemon starting"
+
+exit 101
+EOF
+
+ chmod 0755 chroot/usr/sbin/policy-rc.d
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_sysvrc
+ ;;
+
+ remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ if [ -f chroot/usr/sbin/policy-rc.d.orig ]
+ then
+ # Restore policy-rc.d file
+ mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
+ else
+ # Remove policy-rc.d file
+ rm -f chroot/usr/sbin/policy-rc.d
+ fi
+
+ # Removing stage file
+ rm -f .stage/chroot_sysvrc
+ ;;
+
+ *)
+ Usage
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_tasks(1) - install tasks into chroot
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="install tasks into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Echo_message "Begin installing tasks..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_tasks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
-then
- # Restoring cache
- Restore_cache cache/packages_tasks
-
- # Checking depends
- case "${LH_TASKSEL}" in
- aptitude)
- Check_package chroot/usr/bin/aptitude aptitude
- ;;
-
- tasksel)
- Check_package chroot/usr/bin/tasksel tasksel
- ;;
- esac
-
- # Installing depends
- Install_package
-
- # Installing tasks
- case "${LH_TASKSEL}" in
- aptitude)
- Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
- ;;
-
- tasksel)
- for TASK in ${LIVE_TASKS}
- do
- Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
- done
- ;;
- esac
-
- # Removing depends
- Remove_package
-
- # Saving cache
- Save_cache cache/packages_tasks
-
- # Creating stage file
- Create_stagefile .stage/chroot_tasks
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks (from rev 1940, dists/trunk/live-helper/helpers/lh_chroot_tasks)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_chroot_tasks 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_tasks(1) - install tasks into chroot
+# 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 tasks into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin installing tasks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_tasks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
+then
+ # Restoring cache
+ Restore_cache cache/packages_tasks
+
+ # Checking depends
+ case "${LH_TASKSEL}" in
+ aptitude)
+ Check_package chroot/usr/bin/aptitude aptitude
+ ;;
+
+ tasksel)
+ Check_package chroot/usr/bin/tasksel tasksel
+ ;;
+ esac
+
+ # Installing depends
+ Install_package
+
+ # Installing tasks
+ case "${LH_TASKSEL}" in
+ aptitude)
+ Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
+ ;;
+
+ tasksel)
+ for TASK in ${LIVE_TASKS}
+ do
+ Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
+ done
+ ;;
+ esac
+
+ # Removing depends
+ Remove_package
+
+ # Saving cache
+ Save_cache cache/packages_tasks
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_tasks
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_clean 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# lh_clean(1) - clean up system build directories
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="clean up system build directories"
-HELP=""
-USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
-
-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
-
-case "${1}" in
- all)
- "${0}" chroot
- "${0}" binary
- "${0}" lock
- "${0}" stage
- "${0}" source
-
- if [ -d chroot ]
- then
- mkdir -p .stage
- touch .stage/bootstrap
- fi
- ;;
-
- cache)
- ${LH_ROOT_COMMAND} rm -rf cache
- ;;
-
- chroot)
- ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
-
- ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
-
- if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
- then
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
- mkdir -p .stage
- touch .stage/bootstrap
- fi
-
- rm -f .stage/chroot*
- ;;
-
- binary)
- rm -f binary.iso
- rm -f binary.img
- rm -f binary*.tar.gz
- rm -f packages.txt
-
- rm -rf binary
- rm -rf tftpboot
-
- rm -f .stage/binary*
- ;;
-
- lock)
- rm -f .lock
- ;;
-
- purge)
- PURGE="true" "${0}" all
- "${0}" cache
- ;;
-
- stage)
- rm -rf .stage
- ;;
-
- source)
- rm -f source.iso
- rm -f source.img
- rm -f source*.tar
- rm -f source*.tar.gz
-
- rm -rf source
-
- rm -f .stage/source*
- ;;
-
- *)
- "${0}" all
- ;;
-esac
Copied: releases/live-helper/1.0~a13-1/helpers/lh_clean (from rev 1940, dists/trunk/live-helper/helpers/lh_clean)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_clean (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_clean 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# lh_clean(1) - clean up system build directories
+# 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="clean up system build directories"
+HELP=""
+USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
+
+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
+
+case "${1}" in
+ all)
+ "${0}" chroot
+ "${0}" binary
+ "${0}" lock
+ "${0}" stage
+ "${0}" source
+
+ if [ -d chroot ]
+ then
+ mkdir -p .stage
+ touch .stage/bootstrap
+ fi
+ ;;
+
+ cache)
+ ${LH_ROOT_COMMAND} rm -rf cache
+ ;;
+
+ chroot)
+ ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+ ${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
+
+ ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
+
+ if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
+ then
+ ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+ mkdir -p .stage
+ touch .stage/bootstrap
+ fi
+
+ rm -f .stage/chroot*
+ ;;
+
+ binary)
+ rm -f binary.iso
+ rm -f binary.img
+ rm -f binary*.tar.gz
+ rm -f packages.txt
+
+ rm -rf binary
+ rm -rf tftpboot
+
+ rm -f .stage/binary*
+ ;;
+
+ lock)
+ rm -f .lock
+ ;;
+
+ purge)
+ PURGE="true" "${0}" all
+ "${0}" cache
+ ;;
+
+ stage)
+ rm -rf .stage
+ ;;
+
+ source)
+ rm -f source.iso
+ rm -f source.img
+ rm -f source*.tar
+ rm -f source*.tar.gz
+
+ rm -rf source
+
+ rm -f .stage/source*
+ ;;
+
+ *)
+ "${0}" all
+ ;;
+esac
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_config 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,375 +0,0 @@
-#!/bin/sh
-
-# lh_config(1) - create configuration for live-helper(7)
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create configuration for live-helper(7)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-CONFIG="${1}"
-
-if [ -n "${LH_CONFIG}" ]
-then
- if [ -d ${LH_BASE-:/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
- then
- mkdir "${LH_CONFIG}"
- cp -r ${LH_BASE-:/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
-
- LIVE_ROOT="${LH_CONFIG}"
- CONFIG=""
- else
- Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE-:/usr/share/live-helper}/configs/."
- fi
-fi
-
-if [ "${CONFIG}" != "newconfig" ]
-then
- # Source existing configuration
- Read_conffile "${LIVE_ROOT}"/config/common
- Read_conffile "${LIVE_ROOT}"/config/bootstrap
- Read_conffile "${LIVE_ROOT}"/config/chroot
- Read_conffile "${LIVE_ROOT}"/config/binary
- Read_conffile "${LIVE_ROOT}"/config/source
-fi
-
-# Setting defaults
-Set_defaults
-
-# Creating bootstrap configuration
-mkdir -p "${LIVE_ROOT}"/config
-mkdir -p "${LIVE_ROOT}"/config/includes
-mkdir -p "${LIVE_ROOT}"/config/templates
-
-# Creating live-helper configuration
-cat > "${LIVE_ROOT}"/config/common << EOF
-# config/common - common options for live-helper(7)
-
-# \$LH_APT: set package manager
-# (Default: ${LH_APT})
-LH_APT="${LH_APT}"
-
-# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
-
-# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
-
-# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: ${LH_APT_PDIFFS})
-LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-
-# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: ${LH_APT_PIPELINE})
-LH_APT_PIPELINE="${LH_APT_PIPELINE}"
-
-# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: ${LH_APT_RECOMMENDS})
-LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-
-# \$LH_APT_SECURE: set apt/aptitude security
-# (Default: ${LH_APT_SECURE})
-LH_APT_SECURE="${LH_APT_SECURE}"
-
-# \$LH_BOOTSTRAP: set bootstrap program
-# (Default: ${LH_BOOTSTRAP})
-LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-
-# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: ${LH_CACHE_INDICES})
-LH_CACHE_INDICES="${LH_CACHE_INDICES}"
-
-# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: ${LH_CACHE_PACKAGES})
-LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
-
-# \$LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: ${LH_CACHE_STAGES})
-LH_CACHE_STAGES="${LH_CACHE_STAGES}"
-
-# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: ${LH_DEBCONF_FRONTEND})
-LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-
-# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: ${LH_DEBCONF_NOWARNINGS})
-LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-
-# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
-# \$LH_GENISOIMAGE: set genisoimage program
-# (Default: ${LH_GENISOIMAGE})
-LH_GENISOIMAGE="${LH_GENISOIMAGE}"
-
-# \$LH_INITRAMFS: set initramfs hook
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
-
-# \$LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="${LH_LOSETUP}"
-
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
-
-# \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# \$LH_TASKSEL: set tasksel program
-# (Default: ${LH_TASKSEL})
-LH_TASKSEL="${LH_TASKSEL}"
-
-# \$LIVE_ROOT: set root directory
-# (Default: ${LIVE_ROOT})
-LIVE_ROOT="${LIVE_ROOT}"
-
-# \$LIVE_INCLUDES: set includes
-# (Default: ${LIVE_INCLUDES})
-LIVE_INCLUDES="${LIVE_INCLUDES}"
-
-# \$LIVE_TEMPLATES: set templates
-# (Default: ${LIVE_TEMPLATES})
-LIVE_TEMPLATES="${LIVE_TEMPLATES}"
-
-# Live-helper options
-
-# \$LH_BREAKPOINTS: enable breakpoints
-# (Default: ${LH_BREAKPOINTS})
-#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
-
-# \$LH_DEBUG: enable debug
-# (Default: ${LH_DEBUG})
-#LH_DEBUG="${LH_DEBUG}"
-
-# \$LH_FORCE: enable force
-# (Default: ${LH_FORCE})
-#LH_FORCE="${LH_FORCE}"
-
-# \$LH_QUIET: enable quiet
-# (Default: ${LH_QUIET})
-#LH_QUIET="${LH_QUIET}"
-
-# \$LH_VERBOSE: enable verbose
-# (Default: ${LH_VERBOSE})
-#LH_VERBOSE="${LH_VERBOSE}"
-EOF
-
-# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# \$LIVE_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
-
-# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
-# (Default: empty)
-LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
-
-# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-
-# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
-
-# \$LIVE_DISTRIBUTION: select distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP})
-LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
-
-# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
-LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
-
-# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY})
-LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
-
-# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
-LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
-
-# \$LIVE_SECTIONS: select section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
-EOF
-
-# Creating lh_chroot_* configuration
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
-
-cat > "${LIVE_ROOT}"/config/chroot << EOF
-# config/chroot - options for live-helper(7), chroot stage
-
-# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: ${LIVE_CHROOT_FILESYSTEM})
-LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
-
-# \$LIVE_HOOKS: set hook commands
-# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
-
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
-
-# \$LIVE_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
-
-# \$LIVE_LANGUAGE: set language to use
-# (Default: empty)
-LIVE_LANGUAGE="${LIVE_LANGUAGE}"
-
-# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
-
-# \$LIVE_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
-
-# \$LIVE_PACKAGES: set packages to install
-# (Default: empty)
-LIVE_PACKAGES="${LIVE_PACKAGES}"
-
-# \$LIVE_PACKAGES_LISTS: set package list to install
-# (Default: ${LIVE_PACKAGES_LISTS})
-LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
-
-# \$LIVE_TASKS: set tasks to install
-# (Default: empty)
-LIVE_TASKS="${LIVE_TASKS}"
-
-# \$LIVE_SECURITY: enable security updates
-# (Default: ${LIVE_SECURITY})
-LIVE_SECURITY="${LIVE_SECURITY}"
-
-# \$LIVE_SYMLINKS: enable symlink convertion
-# (Default: ${LIVE_SYMLINKS})
-LIVE_SYMLINKS="${LIVE_SYMLINKS}"
-
-# \$LIVE_SYSVINIT: enable sysvinit
-# (Default: ${LIVE_SYSVINIT})
-LIVE_SYSVINIT="${LIVE_SYSVINIT}"
-EOF
-
-# Creating lh_binary_* configuration
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
-mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
-
-cat > "${LIVE_ROOT}"/config/binary << EOF
-# config/binary - options for live-helper(7), binary stage
-
-# \$LIVE_BINARY_IMAGES: set image type
-# (Default: ${LIVE_BINARY_IMAGES})
-LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
-
-# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LIVE_BINARY_INDICES})
-LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
-
-# \$LIVE_BOOTAPPEND: set boot parameters
-# (Default: empty)
-LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
-
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
-
-# \$LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LIVE_DEBIAN_INSTALLER})
-LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
-
-# \$LIVE_ENCRYPTION: set encrytion
-# (Default: empty)
-LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
-
-# \$LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
-
-# \$LIVE_HOSTNAME: set hostname
-# (Default: ${LIVE_HOSTNAME})
-LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-
-# \$LIVE_ISO_APPLICATION: set iso author
-# (Default: ${LIVE_ISO_APPLICATION})
-LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
-
-# \$LIVE_ISO_PREPARER: set iso preparer
-# (Default: ${LIVE_ISO_PREPARER})
-LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
-
-# \$LIVE_ISO_PUBLISHER: set iso preparer
-# (Default: ${LIVE_ISO_PUBLISHER})
-LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
-
-# \$LIVE_ISO_VOLUME: set iso volume
-# (Default: ${LIVE_ISO_VOLUME})
-LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
-
-# \$LIVE_NET_PATH: set netboot server directory
-# (Default: ${LIVE_NET_PATH})
-LIVE_NET_PATH="${LIVE_NET_PATH}"
-
-# \$LIVE_NET_SERVER: set netboot server address
-# (Default: ${LIVE_NET_SERVER})
-LIVE_NET_SERVER="${LIVE_NET_SERVER}"
-
-# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
-EOF
-
-# Creating lh_source_* configuration
-cat > "${LIVE_ROOT}"/config/source << EOF
-# config/source - options for live-helper(7), source stage
-
-# \$LIVE_SOURCE: set source option
-# (Default: ${LIVE_SOURCE})
-LIVE_SOURCE="${LIVE_SOURCE}"
-
-# \$LIVE_SOURCE_IMAGES: set image type
-# (Default: ${LIVE_SOURCE_IMAGES})
-LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
-EOF
Copied: releases/live-helper/1.0~a13-1/helpers/lh_config (from rev 1940, dists/trunk/live-helper/helpers/lh_config)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_config (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_config 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,377 @@
+#!/bin/sh
+
+# lh_config(1) - create configuration for live-helper(7)
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create configuration for live-helper(7)"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+CONFIG="${1}"
+
+if [ -n "${LH_CONFIG}" ]
+then
+ if [ -d ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
+ then
+ mkdir "${LH_CONFIG}"
+ cp -r ${LH_BASE:-/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
+
+ LIVE_ROOT="${LH_CONFIG}"
+ CONFIG=""
+ else
+ Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE:-/usr/share/live-helper}/configs/."
+ fi
+fi
+
+if [ "${CONFIG}" != "newconfig" ]
+then
+ # Source existing configuration
+ Read_conffile "${LIVE_ROOT}"/config/common
+ Read_conffile "${LIVE_ROOT}"/config/bootstrap
+ Read_conffile "${LIVE_ROOT}"/config/chroot
+ Read_conffile "${LIVE_ROOT}"/config/binary
+ Read_conffile "${LIVE_ROOT}"/config/source
+fi
+
+# Setting defaults
+Set_defaults
+
+# Creating bootstrap configuration
+mkdir -p "${LIVE_ROOT}"/config
+mkdir -p "${LIVE_ROOT}"/config/includes
+mkdir -p "${LIVE_ROOT}"/config/templates
+
+# Creating live-helper configuration
+cat > "${LIVE_ROOT}"/config/common << EOF
+# config/common - common options for live-helper(7)
+
+# \$LH_APT: set package manager
+# (Default: ${LH_APT})
+LH_APT="${LH_APT}"
+
+# \$LH_APT_FTPPROXY: set apt/aptitude ftp proxy
+# (Default: autodetected or empty)
+LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
+
+# \$LH_APT_HTTPPROXY: set apt/aptitude http proxy
+# (Default: autodetected or empty)
+LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
+
+# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
+# (Default: ${LH_APT_PDIFFS})
+LH_APT_PDIFFS="${LH_APT_PDIFFS}"
+
+# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LH_APT_PIPELINE})
+LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+
+# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
+# (Default: ${LH_APT_RECOMMENDS})
+LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
+
+# \$LH_APT_SECURE: set apt/aptitude security
+# (Default: ${LH_APT_SECURE})
+LH_APT_SECURE="${LH_APT_SECURE}"
+
+# \$LH_BOOTSTRAP: set bootstrap program
+# (Default: ${LH_BOOTSTRAP})
+LH_BOOTSTRAP="${LH_BOOTSTRAP}"
+
+# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: ${LH_CACHE_INDICES})
+LH_CACHE_INDICES="${LH_CACHE_INDICES}"
+
+# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: ${LH_CACHE_PACKAGES})
+LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
+
+# \$LH_CACHE_STAGES: control if completed stages should be cached
+# (Default: ${LH_CACHE_STAGES})
+LH_CACHE_STAGES="${LH_CACHE_STAGES}"
+
+# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# (Default: ${LH_DEBCONF_FRONTEND})
+LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
+
+# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: ${LH_DEBCONF_NOWARNINGS})
+LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
+
+# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LH_DEBCONF_PRIORITY})
+LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+
+# \$LH_GENISOIMAGE: set genisoimage program
+# (Default: ${LH_GENISOIMAGE})
+LH_GENISOIMAGE="${LH_GENISOIMAGE}"
+
+# \$LH_INITRAMFS: set initramfs hook
+# (Default: ${LH_INITRAMFS})
+LH_INITRAMFS="${LH_INITRAMFS}"
+
+# \$LH_LOSETUP: set losetup program
+# (Default: autodetected)
+LH_LOSETUP="${LH_LOSETUP}"
+
+# \$LH_MODE: set distribution mode
+# (Default: ${LH_MODE})
+LH_MODE="${LH_MODE}"
+
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# \$LH_TASKSEL: set tasksel program
+# (Default: ${LH_TASKSEL})
+LH_TASKSEL="${LH_TASKSEL}"
+
+# \$LIVE_ROOT: set root directory
+# (Default: ${LIVE_ROOT})
+LIVE_ROOT="${LIVE_ROOT}"
+
+# \$LIVE_INCLUDES: set includes
+# (Default: ${LIVE_INCLUDES})
+LIVE_INCLUDES="${LIVE_INCLUDES}"
+
+# \$LIVE_TEMPLATES: set templates
+# (Default: ${LIVE_TEMPLATES})
+LIVE_TEMPLATES="${LIVE_TEMPLATES}"
+
+# Live-helper options
+
+# \$LH_BREAKPOINTS: enable breakpoints
+# (Default: ${LH_BREAKPOINTS})
+#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
+
+# \$LH_DEBUG: enable debug
+# (Default: ${LH_DEBUG})
+#LH_DEBUG="${LH_DEBUG}"
+
+# \$LH_FORCE: enable force
+# (Default: ${LH_FORCE})
+#LH_FORCE="${LH_FORCE}"
+
+# \$LH_QUIET: enable quiet
+# (Default: ${LH_QUIET})
+#LH_QUIET="${LH_QUIET}"
+
+# \$LH_VERBOSE: enable verbose
+# (Default: ${LH_VERBOSE})
+#LH_VERBOSE="${LH_VERBOSE}"
+EOF
+
+# Creating lh_bootstrap_* configuration
+cat > "${LIVE_ROOT}"/config/bootstrap << EOF
+# config/bootstrap - options for live-helper(7), bootstrap stage
+
+# \$LIVE_ARCHITECTURE: select chroot architecture
+# (Default: autodetected)
+LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
+
+# \$LIVE_BOOTSTRAP_CONFIG: set distribution config directory
+# (Default: empty)
+LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
+
+# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
+LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+
+# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+
+# \$LIVE_DISTRIBUTION: select distribution to use
+# (Default: ${LIVE_DISTRIBUTION})
+LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
+
+# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
+
+# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
+LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
+
+# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
+
+# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
+LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
+
+# \$LIVE_SECTIONS: select section(s) to use
+# (Default: ${LIVE_SECTIONS})
+LIVE_SECTIONS="${LIVE_SECTIONS}"
+EOF
+
+# Creating lh_chroot_* configuration
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+
+cat > "${LIVE_ROOT}"/config/chroot << EOF
+# config/chroot - options for live-helper(7), chroot stage
+
+# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LIVE_CHROOT_FILESYSTEM})
+LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+
+# \$LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS="${LIVE_HOOKS}"
+
+# \$LIVE_INTERACTIVE: set interactive build
+# (Default: ${LIVE_INTERACTIVE})
+LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
+
+# \$LIVE_KEYRING_PACKAGES: set keyring packages
+# (Default: empty)
+LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
+
+# \$LIVE_LANGUAGE: set language to use
+# (Default: empty)
+LIVE_LANGUAGE="${LIVE_LANGUAGE}"
+
+# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
+
+# \$LIVE_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
+
+# \$LIVE_PACKAGES: set packages to install
+# (Default: empty)
+LIVE_PACKAGES="${LIVE_PACKAGES}"
+
+# \$LIVE_PACKAGES_LISTS: set package list to install
+# (Default: ${LIVE_PACKAGES_LISTS})
+LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
+
+# \$LIVE_TASKS: set tasks to install
+# (Default: empty)
+LIVE_TASKS="${LIVE_TASKS}"
+
+# \$LIVE_SECURITY: enable security updates
+# (Default: ${LIVE_SECURITY})
+LIVE_SECURITY="${LIVE_SECURITY}"
+
+# \$LIVE_SYMLINKS: enable symlink convertion
+# (Default: ${LIVE_SYMLINKS})
+LIVE_SYMLINKS="${LIVE_SYMLINKS}"
+
+# \$LIVE_SYSVINIT: enable sysvinit
+# (Default: ${LIVE_SYSVINIT})
+LIVE_SYSVINIT="${LIVE_SYSVINIT}"
+EOF
+
+# Creating lh_binary_* configuration
+mkdir -p "${LIVE_ROOT}"/config/binary_grub
+mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
+mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
+
+cat > "${LIVE_ROOT}"/config/binary << EOF
+# config/binary - options for live-helper(7), binary stage
+
+# \$LIVE_BINARY_IMAGES: set image type
+# (Default: ${LIVE_BINARY_IMAGES})
+LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
+
+# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LIVE_BINARY_INDICES})
+LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
+
+# \$LIVE_BOOTAPPEND: set boot parameters
+# (Default: empty)
+LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
+
+# \$LIVE_BOOTLOADER: set bootloader
+# (Default: ${LIVE_BOOTLOADER})
+LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+
+# \$LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LIVE_DEBIAN_INSTALLER})
+LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+
+# \$LIVE_ENCRYPTION: set encrytion
+# (Default: empty)
+LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
+
+# \$LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
+
+# \$LIVE_HOSTNAME: set hostname
+# (Default: ${LIVE_HOSTNAME})
+LIVE_HOSTNAME="${LIVE_HOSTNAME}"
+
+# \$LIVE_ISO_APPLICATION: set iso author
+# (Default: ${LIVE_ISO_APPLICATION})
+LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
+
+# \$LIVE_ISO_PREPARER: set iso preparer
+# (Default: ${LIVE_ISO_PREPARER})
+LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
+
+# \$LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: ${LIVE_ISO_PUBLISHER})
+LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
+
+# \$LIVE_ISO_VOLUME: set iso volume
+# (Default: ${LIVE_ISO_VOLUME})
+LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
+
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
+
+# \$LIVE_NET_PATH: set netboot server directory
+# (Default: ${LIVE_NET_PATH})
+LIVE_NET_PATH="${LIVE_NET_PATH}"
+
+# \$LIVE_NET_SERVER: set netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
+
+# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
+# (Default: empty)
+LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
+
+# \$LIVE_USERNAME: set username
+# (Default: ${LIVE_USERNAME})
+LIVE_USERNAME="${LIVE_USERNAME}"
+EOF
+
+# Creating lh_source_* configuration
+cat > "${LIVE_ROOT}"/config/source << EOF
+# config/source - options for live-helper(7), source stage
+
+# \$LIVE_SOURCE: set source option
+# (Default: ${LIVE_SOURCE})
+LIVE_SOURCE="${LIVE_SOURCE}"
+
+# \$LIVE_SOURCE_IMAGES: set image type
+# (Default: ${LIVE_SOURCE_IMAGES})
+LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
+EOF
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_losetup 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# lh_losetup - wrapper around losetup
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="wrapper around losetup"
-HELP=""
-USAGE="${PROGRAM} <device> <file> <partition>"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ -z "${1}" ]
-then
- DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
-else
- DEVICE="${1}"
-fi
-
-FILE="${2}"
-PARTITION="${3}"
-
-${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
-FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
-${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
-
-LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
-CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`
-#OFFSET="`expr 512 '*' ${CYL}`"
-OFFSET="$((CYL*512))"
-
-echo loop $DEVICE at offset $OFFSET
-
-if [ "${PARTITION}" = "0" ]
-then
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
-else
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_losetup (from rev 1940, dists/trunk/live-helper/helpers/lh_losetup)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_losetup (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_losetup 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# lh_losetup - wrapper around losetup
+# 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="wrapper around losetup"
+HELP=""
+USAGE="${PROGRAM} <device> <file> <partition>"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ -z "${1}" ]
+then
+ DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
+else
+ DEVICE="${1}"
+fi
+
+FILE="${2}"
+PARTITION="${3}"
+
+${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
+FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
+${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
+
+LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
+CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`
+#OFFSET="`expr 512 '*' ${CYL}`"
+OFFSET="$((CYL*512))"
+
+echo loop $DEVICE at offset $OFFSET
+
+if [ "${PARTITION}" = "0" ]
+then
+ ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
+else
+ ${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# lh_source(1) - build source images
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source images"
-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
-
-# Enabling network in chroot
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_sources install ${*}
-
-# Preparing images
-lh_source_debian-live ${*}
-lh_source_debian ${*}
-lh_source_md5sum ${*}
-
-# Building images
-lh_source_generic ${*}
-lh_source_hdd ${*}
-lh_source_iso ${*}
-lh_source_net ${*}
-lh_source_usb-hdd ${*}
-
-# Deconfiguring chroot
-rm -f .stage/chroot_sources
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source (from rev 1940, dists/trunk/live-helper/helpers/lh_source)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# lh_source(1) - build source images
+# 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="build source images"
+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
+
+# Enabling network in chroot
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_sources install ${*}
+
+# Preparing images
+lh_source_debian-live ${*}
+lh_source_debian ${*}
+lh_source_md5sum ${*}
+
+# Building images
+lh_source_generic ${*}
+lh_source_hdd ${*}
+lh_source_iso ${*}
+lh_source_net ${*}
+lh_source_usb-hdd ${*}
+
+# Deconfiguring chroot
+rm -f .stage/chroot_sources
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_debian
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_debian 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_source_debian(1) - download sources
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="debian sources"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin downloading sources..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_debian
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian ]
-then
- rm -rf source/debian
-fi
-
-# Download sources
-Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
-echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
-#echo "live-helper" >> chroot/root/dpkg-selection.txt
-Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
-rm -f chroot/root/dpkg-selection.txt
-
-# Sort sources
-for DSC in chroot/*.dsc
-do
- SOURCE="`sed -n 's/^Source: //p' ${DSC}`"
-
- case "${SOURCE}" in
- lib?*)
- LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
- ;;
-
- *)
- LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
- ;;
- esac
-
- # Install directory
- mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
-
- # Move files
- mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
-done
-
-# Creating stage file
-Create_stagefile .stage/source_debian
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_debian (from rev 1940, dists/trunk/live-helper/helpers/lh_source_debian)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_debian (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_debian 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_source_debian(1) - download sources
+# 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="debian sources"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin downloading sources..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian ]
+then
+ rm -rf source/debian
+fi
+
+# Download sources
+Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
+echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
+#echo "live-helper" >> chroot/root/dpkg-selection.txt
+Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
+rm -f chroot/root/dpkg-selection.txt
+
+# Sort sources
+for DSC in chroot/*.dsc
+do
+ SOURCE="`sed -n 's/^Source: //p' ${DSC}`"
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+ ;;
+
+ *)
+ LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
+done
+
+# Creating stage file
+Create_stagefile .stage/source_debian
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian-live 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# lh_source_debian-live(1) - copy debian-live config into source
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="copy debian-live config into source"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin copying live-helper configuration..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_debian-live
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian-live ]
-then
- rm -rf source/debian-live
-fi
-
-# Copy system configuration
-mkdir -p source/debian-live
-cp -a config source/debian-live
-
-# Create tarball
-cd source
-tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
-cd "${OLDPWD}"
-
-rm -rf source/debian-live/config
-mv source/debian-live-config_*.tar.gz source/debian-live
-
-# Creating stage file
-Create_stagefile .stage/source_debian-live
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live (from rev 1940, dists/trunk/live-helper/helpers/lh_source_debian-live)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_debian-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# lh_source_debian-live(1) - copy debian-live config into source
+# 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 debian-live config into source"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin copying live-helper configuration..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian-live
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian-live ]
+then
+ rm -rf source/debian-live
+fi
+
+# Copy system configuration
+mkdir -p source/debian-live
+cp -a config source/debian-live
+
+# Create tarball
+cd source
+tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
+cd "${OLDPWD}"
+
+rm -rf source/debian-live/config
+mv source/debian-live-config_*.tar.gz source/debian-live
+
+# Creating stage file
+Create_stagefile .stage/source_debian-live
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_generic 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_source_generic(1) - build source generic image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source generic image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic
-then
- exit 0
-fi
-
-Echo_message "Begin building source generic image..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_generic
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source.tar ]
-then
- rm -f source.tar
-fi
-
-# Create tarball
-tar cf source.tar source
-
-# Creating stage file
-Create_stagefile .stage/source_generic
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_generic (from rev 1940, dists/trunk/live-helper/helpers/lh_source_generic)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_generic (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_generic 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_source_generic(1) - build source generic image
+# 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="build source generic image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic
+then
+ exit 0
+fi
+
+Echo_message "Begin building source generic image..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_generic
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source.tar ]
+then
+ rm -f source.tar
+fi
+
+# Create tarball
+tar cf source.tar source
+
+# Creating stage file
+Create_stagefile .stage/source_generic
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# lh_source_hdd(1) - build source harddisk image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source harddisk image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building source harddisk image..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source-hdd.tar.gz ]
-then
- rm -f source-hdd.tar.gz
-fi
-
-# Create tarball
-tar cfz source-hdd.tar.gz source
-
-# Creating stage file
-Create_stagefile .stage/source_hdd
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_source_hdd)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_hdd (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# lh_source_hdd(1) - build source harddisk image
+# 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="build source harddisk image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building source harddisk image..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source-hdd.tar.gz ]
+then
+ rm -f source-hdd.tar.gz
+fi
+
+# Create tarball
+tar cfz source-hdd.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_hdd
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# lh_source_iso(1) - build iso source image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build iso source image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
-then
- exit 0
-fi
-
-Echo_message "Begin building source iso image..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_iso
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
-
-# Installing depends
-Install_package
-
-# Remove old iso image
-if [ -f source.iso ]
-then
- rm -f source.iso
-fi
-
-if [ "${LH_VERBOSE}" = "enabled" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-fi
-
-if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
-fi
-
-if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
-fi
-
-if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
-fi
-
-if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
-then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
-fi
-
-# Moving image
-mv source chroot
-
-cat >> chroot/source.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
-EOF
-
-Chroot "sh source.sh"
-
-# Move image
-mv chroot/source chroot/source.iso ./
-rm -f chroot/source.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_iso
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_iso (from rev 1940, dists/trunk/live-helper/helpers/lh_source_iso)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_iso (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_iso 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# lh_source_iso(1) - build iso source image
+# 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="build iso source image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
+then
+ exit 0
+fi
+
+Echo_message "Begin building source iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f source.iso ]
+then
+ rm -f source.iso
+fi
+
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
+
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv source chroot
+
+cat >> chroot/source.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
+EOF
+
+Chroot "sh source.sh"
+
+# Move image
+mv chroot/source chroot/source.iso ./
+rm -f chroot/source.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_iso
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_source_md5sum(1) - create source md5sums
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="create source md5sums"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin creating source md5sum.txt..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_md5sum
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old md5sums
-if [ -f source/md5sum.txt ]
-then
- rm -f source/md5sum.txt
-fi
-
-# Calculating md5sums
-cd source
-find . -type f | sort | xargs md5sum > ../md5sum.txt
-mv ../md5sum.txt ./
-cd "${OLDPWD}"
-
-# Creating stage file
-Create_stagefile .stage/source_md5sum
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum (from rev 1940, dists/trunk/live-helper/helpers/lh_source_md5sum)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_md5sum 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# lh_source_md5sum(1) - create source md5sums
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+ . "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="create source md5sums"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin creating source md5sum.txt..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_md5sum
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old md5sums
+if [ -f source/md5sum.txt ]
+then
+ rm -f source/md5sum.txt
+fi
+
+# Calculating md5sums
+cd source
+find . -type f | sort | xargs md5sum > ../md5sum.txt
+mv ../md5sum.txt ./
+cd "${OLDPWD}"
+
+# Creating stage file
+Create_stagefile .stage/source_md5sum
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# lh_source_net(1) - build source net image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source net image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
-then
- exit 0
-fi
-
-Echo_message "Begin building source netboot image..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_net
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source-net.tar.gz ]
-then
- rm -f source-net.tar.gz
-fi
-
-# Create tarball
-tar cfz source-net.tar.gz source
-
-# Creating stage file
-Create_stagefile .stage/source_net
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_net (from rev 1940, dists/trunk/live-helper/helpers/lh_source_net)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_net (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_net 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# lh_source_net(1) - build source net image
+# 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="build source net image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
+then
+ exit 0
+fi
+
+Echo_message "Begin building source netboot image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_net
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source-net.tar.gz ]
+then
+ rm -f source-net.tar.gz
+fi
+
+# Create tarball
+tar cfz source-net.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_net
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# lh_source_usb-hdd(1) - build source usb-hdd image
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="build source image"
-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_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
-then
- exit 0
-fi
-
-Echo_message "Begin building source usb-hdd image..."
-
-# Requiring stage file
-Require_stagefile .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_usb-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/sbin/parted parted
-
-# Installing depends
-Install_package
-
-# Remove old source
-if [ -f source.img ]
-then
- rm -f source.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="`du -ms source | cut -f1`"
-REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
-FREELO="`${LH_LOSETUP} -f`"
-if [ ! -b chroot/${FREELO} ]
-then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
-fi
-
-echo "!!! The following error/warning messages can be ignored !!!"
-lh_losetup $FREELO source.img 0
-Chroot "parted -s ${FREELO} mklabel msdos" || true
-Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-Chroot "parted -s ${FREELO} set 1 lba off" || true
-${LH_LOSETUP} -d ${FREELO}
-
-lh_losetup $FREELO source.img 1
-Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-mkdir -p source.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
-cp -r source/* source.tmp
-${LH_ROOT_COMMAND} umount source.tmp
-rmdir source.tmp
-${LH_LOSETUP} -d ${FREELO}
-echo "!!! The above error/warning messages can be ignored !!!"
-
-if [ -n "${MAKEDEV}" ]
-then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
-fi
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_usb-hdd
Copied: releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd (from rev 1940, dists/trunk/live-helper/helpers/lh_source_usb-hdd)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_source_usb-hdd 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# lh_source_usb-hdd(1) - build source usb-hdd image
+# 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="build source image"
+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_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
+then
+ exit 0
+fi
+
+Echo_message "Begin building source usb-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_usb-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/sbin/parted parted
+
+# Installing depends
+Install_package
+
+# Remove old source
+if [ -f source.img ]
+then
+ rm -f source.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms source | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO source.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+${LH_LOSETUP} -d ${FREELO}
+
+lh_losetup $FREELO source.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p source.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+cp -r source/* source.tmp
+${LH_ROOT_COMMAND} umount source.tmp
+rmdir source.tmp
+${LH_LOSETUP} -d ${FREELO}
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_usb-hdd
Deleted: releases/live-helper/1.0~a13-1/helpers/lh_testroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_testroot 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/lh_testroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# lh_testroot(1) - ensure that a system is built as root
-# 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
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-DESCRIPTION="ensure that a system is built as root"
-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
-
-# Checking user account
-if [ "`${LH_ROOT_COMMAND} id -u`" -ne "0" ]
-then
- Echo_error "need root privileges"
- exit 1
-fi
Copied: releases/live-helper/1.0~a13-1/helpers/lh_testroot (from rev 1940, dists/trunk/live-helper/helpers/lh_testroot)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/lh_testroot (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/lh_testroot 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# lh_testroot(1) - ensure that a system is built as root
+# 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="ensure that a system is built as root"
+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
+
+# Checking user account
+if [ "`${LH_ROOT_COMMAND} id -u`" -ne "0" ]
+then
+ Echo_error "need root privileges"
+ exit 1
+fi
Deleted: releases/live-helper/1.0~a13-1/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-06-02 21:07:33 UTC (rev 1932)
+++ releases/live-helper/1.0~a13-1/helpers/make-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -1,407 +0,0 @@
-#!/bin/sh
-
-# make-live(1) - utility to build Debian Live systems
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
-
-set -e
-
-# Including common functions
-for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Setting static variables
-PROGRAM="`basename ${0}`"
-DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
-
-HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
-
-Local_arguments ()
-{
- ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
- if [ "${?}" -ne "0" ]
- then
- echo "Terminating." >&2
- exit 1
- fi
-
- if [ "${1}" = "config" ]
- then
- CONFIG="true"
- fi
-
- eval set -- "${ARGUMENTS}"
-
- while true
- do
- case "${1}" in
- # common
- --mode)
- LH_MODE="${2}"; shift 2
- ;;
-
- --config)
- LH_CONFIG="${2}"; shift 2
- ;;
-
- --apt)
- LH_APT="${2}"; shift 2
- ;;
-
- --apt-ftpproxy)
- LH_APT_FTPPROXY="${2}"; shift 2
- ;;
-
- --apt-httpproxy)
- LH_APT_HTTPPROXY="${2}"; shift 2
- ;;
-
- --binary-indices)
- LH_BINARY_INDICES="${2}"; shift 2
- ;;
-
- --apt-pdiffs)
- LH_APT_PDIFFS="${2}"; shift 2
- ;;
-
- --apt-recommends)
- LH_APT_RECOMMENDS="${2}"; shift 2
- ;;
-
- --apt-secure)
- LH_APT_SECURE="${2}"; shift 2
- ;;
-
- --bootstrap)
- LH_BOOTSTRAP="${2}"; shift 2
- ;;
-
- --cache)
- LH_CACHE="${2}"; shift 2
- ;;
-
- --debconf-frontend)
- LH_DEBCONF_FRONTEND="${2}"; shift 2
- ;;
-
- --debconf-priority)
- LH_DEBCONF_PRIORITY="${2}"; shift 2
- ;;
-
- --debconf-nowarnings)
- LH_DEBCONF_NOWARNINGS="${2}"; shift 2
- ;;
-
- --genisoimage)
- LH_GENISOIMAGE="${2}"; shift 2
- ;;
-
- --losetup)
- LH_LOSETUP="${2}"; shift 2
- ;;
-
- --tasksel)
- LH_TASKSEL="${2}"; shift 2
- ;;
-
- -r|--root)
- LIVE_ROOT="${2}"; shift 2
- ;;
-
- --root-command)
- LIVE_ROOT_COMMAND="${2}"; shift 2
- ;;
-
- # bootstrap
- -a|--architecture)
- LIVE_ARCHITECTURE="${2}"; shift 2
- ;;
-
- -d|--distribution)
- LIVE_DISTRIBUTION="${2}"; shift 2
- export LIVE_DISTRIBUTION
- ;;
-
- --distribution-config)
- LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
- ;;
-
- -f|--bootstrap-flavour)
- LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
- ;;
-
- -m|--mirror-bootstrap)
- LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
- ;;
-
- --mirror-bootstrap-security)
- LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
- ;;
-
- --mirror-binary)
- LIVE_MIRROR_BINARY="${2}"; shift 2
- ;;
-
- --mirror-binary-security)
- LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
- ;;
-
- --sections)
- LIVE_SECTIONS="${2}"; shift 2
- ;;
-
- # chroot
- --interactive)
- LIVE_INTERACTIVE="${2}"; shift 2
- ;;
-
- --initramfs)
- LH_INITRAMFS="${2}"; shift 2
- ;;
-
- -k|--linux-flavours)
- LIVE_LINUX_FLAVOURS="${2}"; shift 2
- ;;
-
- --linux-packages)
- LIVE_LINUX_PACKAGES="${2}"; shift 2
- ;;
-
- --keyring-packages)
- LIVE_KEYRING_PACKAGS="${2}"; shift 2
- ;;
-
- --hooks)
- LIVE_HOOKS="${2}"; shift 2
- ;;
-
- -l|--language)
- LIVE_LANGUAGE="${2}"; shift 2
- ;;
-
- --packages)
- LIVE_PACKAGES="${2}"; shift 2
- ;;
-
- -p|--packages-lists)
- LIVE_PACKAGES_LISTS="${2}"; shift 2
- ;;
-
- --tasks)
- LIVE_TASKS="${2}"; shift 2
- ;;
-
- --security)
- LIVE_SECURITY="${2}"; shift 2
- ;;
-
- --symlinks)
- LIVE_SYMLINKS="${2}"; shift 2
- ;;
-
- --sysvinit)
- LIVE_SYSVINIT="${2}"; shift 2
- ;;
-
- # image
- --bootappend)
- LIVE_BOOTAPPEND="${2}"; shift 2
- ;;
-
- -e|--encryption)
- LIVE_ENCRYPTION="${2}"; shift 2
- ;;
-
- --username)
- LIVE_USERNAME="${2}"; shift 2
- ;;
-
- --hostname)
- LIVE_HOSTNAME="${2}"; shift 2
- ;;
-
- --chroot-filesystem)
- LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
- ;;
-
- --memtest)
- LIVE_MEMTEST="${2}"; shift 2
- ;;
-
- --iso-application)
- LIVE_ISO_APPLICATION="${2}"; shift 2
- ;;
-
- --iso-preparer)
- LIVE_ISO_PREPARER="${2}"; shift 2
- ;;
-
- --iso-publisher)
- LIVE_ISO_PUBLISHER="${2}"; shift 2
- ;;
-
- --iso-volume)
- LIVE_ISO_VOLUME="${2}"; shift 2
- ;;
-
- --net-server)
- LIVE_NET_SERVER="${2}"; shift 2
- ;;
-
- --net-path)
- LIVE_NET_PATH="${2}"; shift 2
- ;;
-
- --source)
- LIVE_SOURCE="${2}"; shift 2
- ;;
-
- --bootloader)
- LIVE_BOOTLOADER="${2}"; shift 2
- ;;
-
- --grub-splash)
- LIVE_GRUB_SPLASH="${2}"; shift 2
- ;;
-
- --syslinux-splash)
- LIVE_SYSLINUX_SPLASH="${2}"; shift 2
- ;;
-
- -b|--binary-images)
- LIVE_BINARY_IMAGES="${2}"; shift 2
- ;;
-
- -s|--source-images)
- LIVE_SOURCE_IMAGES="${2}"; shift 2
- ;;
-
- --includes)
- LIVE_INCLUDES="${2}"; shift 2
- ;;
-
- --templates)
- LIVE_TEMPLATES="${2}"; shift 2
- ;;
-
- # other
- -h|--help)
- Help; shift
- ;;
-
- -u|--usage)
- Usage; shift
- ;;
-
- -v|--version)
- Version; shift
- ;;
-
- --breakpoints)
- LH_BREAKPOINTS="enabled"; shift
- ;;
-
- --debug)
- LH_DEBUG="enabled"; shift
- ;;
-
- --force)
- LH_FORCE="enabled"; shift
- ;;
-
- --quiet)
- LH_QUIET="enabled"; shift
- ;;
-
- --verbose)
- LH_VERBOSE="enabled"; shift
- ;;
-
- --)
- shift; break
- ;;
-
- *)
- echo "Internal error."
- exit 1
- ;;
- esac
- done
-}
-
-Main ()
-{
- Local_arguments "${@}"
-
- Set_defaults
-
- ROOT="${ROOT:-$LIVE_ROOT}"
-
- # Source existing configuration
- Read_conffile "${ROOT}"/config/common
- Read_conffile "${ROOT}"/config/bootstrap
- Read_conffile "${ROOT}"/config/chroot
- Read_conffile "${ROOT}"/config/image
-
- Local_arguments "${@}"
-
- # Configuring (this is really shit!)
- LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
-
- if [ "${LH_BREAKPOINTS}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --breakpoints"
- fi
-
- if [ "${LH_DEBUG}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --debug"
- fi
-
- if [ "${LH_FORCE}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --force"
- fi
-
- if [ "${LH_QUIET}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --quiet"
- fi
-
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- OPTIONS="${OPTIONS} --verbose"
- fi
-
- # Building
- if [ -z "${CONFIG}" ]
- then
- cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
- fi
-}
-
-trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
- if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
- 0 1 2 3 9 15
-
-Main "${@}"
Copied: releases/live-helper/1.0~a13-1/helpers/make-live (from rev 1940, dists/trunk/live-helper/helpers/make-live)
===================================================================
--- releases/live-helper/1.0~a13-1/helpers/make-live (rev 0)
+++ releases/live-helper/1.0~a13-1/helpers/make-live 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,409 @@
+#!/bin/sh
+
+# make-live(1) - utility to build Debian Live systems
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# On Debian systems, the complete text of the GNU General Public License
+# can be found in /usr/share/common-licenses/GPL file.
+
+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
+PROGRAM="`basename ${0}`"
+DESCRIPTION="utility to build Debian Live systems"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+
+HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
+
+Local_arguments ()
+{
+ ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+
+ if [ "${?}" -ne "0" ]
+ then
+ echo "Terminating." >&2
+ exit 1
+ fi
+
+ if [ "${1}" = "config" ]
+ then
+ CONFIG="true"
+ fi
+
+ eval set -- "${ARGUMENTS}"
+
+ while true
+ do
+ case "${1}" in
+ # common
+ --mode)
+ LH_MODE="${2}"; shift 2
+ ;;
+
+ --config)
+ LH_CONFIG="${2}"; shift 2
+ ;;
+
+ --apt)
+ LH_APT="${2}"; shift 2
+ ;;
+
+ --apt-ftpproxy)
+ LH_APT_FTPPROXY="${2}"; shift 2
+ ;;
+
+ --apt-httpproxy)
+ LH_APT_HTTPPROXY="${2}"; shift 2
+ ;;
+
+ --binary-indices)
+ LH_BINARY_INDICES="${2}"; shift 2
+ ;;
+
+ --apt-pdiffs)
+ LH_APT_PDIFFS="${2}"; shift 2
+ ;;
+
+ --apt-recommends)
+ LH_APT_RECOMMENDS="${2}"; shift 2
+ ;;
+
+ --apt-secure)
+ LH_APT_SECURE="${2}"; shift 2
+ ;;
+
+ --bootstrap)
+ LH_BOOTSTRAP="${2}"; shift 2
+ ;;
+
+ --cache)
+ LH_CACHE="${2}"; shift 2
+ ;;
+
+ --debconf-frontend)
+ LH_DEBCONF_FRONTEND="${2}"; shift 2
+ ;;
+
+ --debconf-priority)
+ LH_DEBCONF_PRIORITY="${2}"; shift 2
+ ;;
+
+ --debconf-nowarnings)
+ LH_DEBCONF_NOWARNINGS="${2}"; shift 2
+ ;;
+
+ --genisoimage)
+ LH_GENISOIMAGE="${2}"; shift 2
+ ;;
+
+ --losetup)
+ LH_LOSETUP="${2}"; shift 2
+ ;;
+
+ --tasksel)
+ LH_TASKSEL="${2}"; shift 2
+ ;;
+
+ -r|--root)
+ LIVE_ROOT="${2}"; shift 2
+ ;;
+
+ --root-command)
+ LIVE_ROOT_COMMAND="${2}"; shift 2
+ ;;
+
+ # bootstrap
+ -a|--architecture)
+ LIVE_ARCHITECTURE="${2}"; shift 2
+ ;;
+
+ -d|--distribution)
+ LIVE_DISTRIBUTION="${2}"; shift 2
+ export LIVE_DISTRIBUTION
+ ;;
+
+ --distribution-config)
+ LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
+ ;;
+
+ -f|--bootstrap-flavour)
+ LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
+ ;;
+
+ -m|--mirror-bootstrap)
+ LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
+ ;;
+
+ --mirror-bootstrap-security)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
+ ;;
+
+ --mirror-binary)
+ LIVE_MIRROR_BINARY="${2}"; shift 2
+ ;;
+
+ --mirror-binary-security)
+ LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
+ ;;
+
+ --sections)
+ LIVE_SECTIONS="${2}"; shift 2
+ ;;
+
+ # chroot
+ --interactive)
+ LIVE_INTERACTIVE="${2}"; shift 2
+ ;;
+
+ --initramfs)
+ LH_INITRAMFS="${2}"; shift 2
+ ;;
+
+ -k|--linux-flavours)
+ LIVE_LINUX_FLAVOURS="${2}"; shift 2
+ ;;
+
+ --linux-packages)
+ LIVE_LINUX_PACKAGES="${2}"; shift 2
+ ;;
+
+ --keyring-packages)
+ LIVE_KEYRING_PACKAGS="${2}"; shift 2
+ ;;
+
+ --hooks)
+ LIVE_HOOKS="${2}"; shift 2
+ ;;
+
+ -l|--language)
+ LIVE_LANGUAGE="${2}"; shift 2
+ ;;
+
+ --packages)
+ LIVE_PACKAGES="${2}"; shift 2
+ ;;
+
+ -p|--packages-lists)
+ LIVE_PACKAGES_LISTS="${2}"; shift 2
+ ;;
+
+ --tasks)
+ LIVE_TASKS="${2}"; shift 2
+ ;;
+
+ --security)
+ LIVE_SECURITY="${2}"; shift 2
+ ;;
+
+ --symlinks)
+ LIVE_SYMLINKS="${2}"; shift 2
+ ;;
+
+ --sysvinit)
+ LIVE_SYSVINIT="${2}"; shift 2
+ ;;
+
+ # image
+ --bootappend)
+ LIVE_BOOTAPPEND="${2}"; shift 2
+ ;;
+
+ -e|--encryption)
+ LIVE_ENCRYPTION="${2}"; shift 2
+ ;;
+
+ --username)
+ LIVE_USERNAME="${2}"; shift 2
+ ;;
+
+ --hostname)
+ LIVE_HOSTNAME="${2}"; shift 2
+ ;;
+
+ --chroot-filesystem)
+ LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
+ ;;
+
+ --memtest)
+ LIVE_MEMTEST="${2}"; shift 2
+ ;;
+
+ --iso-application)
+ LIVE_ISO_APPLICATION="${2}"; shift 2
+ ;;
+
+ --iso-preparer)
+ LIVE_ISO_PREPARER="${2}"; shift 2
+ ;;
+
+ --iso-publisher)
+ LIVE_ISO_PUBLISHER="${2}"; shift 2
+ ;;
+
+ --iso-volume)
+ LIVE_ISO_VOLUME="${2}"; shift 2
+ ;;
+
+ --net-server)
+ LIVE_NET_SERVER="${2}"; shift 2
+ ;;
+
+ --net-path)
+ LIVE_NET_PATH="${2}"; shift 2
+ ;;
+
+ --source)
+ LIVE_SOURCE="${2}"; shift 2
+ ;;
+
+ --bootloader)
+ LIVE_BOOTLOADER="${2}"; shift 2
+ ;;
+
+ --grub-splash)
+ LIVE_GRUB_SPLASH="${2}"; shift 2
+ ;;
+
+ --syslinux-splash)
+ LIVE_SYSLINUX_SPLASH="${2}"; shift 2
+ ;;
+
+ -b|--binary-images)
+ LIVE_BINARY_IMAGES="${2}"; shift 2
+ ;;
+
+ -s|--source-images)
+ LIVE_SOURCE_IMAGES="${2}"; shift 2
+ ;;
+
+ --includes)
+ LIVE_INCLUDES="${2}"; shift 2
+ ;;
+
+ --templates)
+ LIVE_TEMPLATES="${2}"; shift 2
+ ;;
+
+ # other
+ -h|--help)
+ Help; shift
+ ;;
+
+ -u|--usage)
+ Usage; shift
+ ;;
+
+ -v|--version)
+ Version; shift
+ ;;
+
+ --breakpoints)
+ LH_BREAKPOINTS="enabled"; shift
+ ;;
+
+ --debug)
+ LH_DEBUG="enabled"; shift
+ ;;
+
+ --force)
+ LH_FORCE="enabled"; shift
+ ;;
+
+ --quiet)
+ LH_QUIET="enabled"; shift
+ ;;
+
+ --verbose)
+ LH_VERBOSE="enabled"; shift
+ ;;
+
+ --)
+ shift; break
+ ;;
+
+ *)
+ echo "Internal error."
+ exit 1
+ ;;
+ esac
+ done
+}
+
+Main ()
+{
+ Local_arguments "${@}"
+
+ Set_defaults
+
+ ROOT="${ROOT:-$LIVE_ROOT}"
+
+ # Source existing configuration
+ Read_conffile "${ROOT}"/config/common
+ Read_conffile "${ROOT}"/config/bootstrap
+ Read_conffile "${ROOT}"/config/chroot
+ Read_conffile "${ROOT}"/config/image
+
+ Local_arguments "${@}"
+
+ # Configuring (this is really shit!)
+ LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+
+ if [ "${LH_BREAKPOINTS}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --breakpoints"
+ fi
+
+ if [ "${LH_DEBUG}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --debug"
+ fi
+
+ if [ "${LH_FORCE}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --force"
+ fi
+
+ if [ "${LH_QUIET}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --quiet"
+ fi
+
+ if [ "${LH_VERBOSE}" = "enabled" ]
+ then
+ OPTIONS="${OPTIONS} --verbose"
+ fi
+
+ # Building
+ if [ -z "${CONFIG}" ]
+ then
+ cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
+ fi
+}
+
+trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
+ if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
+ 0 1 2 3 9 15
+
+Main "${@}"
Copied: releases/live-helper/1.0~a13-1/includes/etch/live/boot-parameters.txt (from rev 1943, dists/trunk/live-helper/includes/etch/live/boot-parameters.txt)
===================================================================
--- releases/live-helper/1.0~a13-1/includes/etch/live/boot-parameters.txt (rev 0)
+++ releases/live-helper/1.0~a13-1/includes/etch/live/boot-parameters.txt 2007-06-03 13:30:50 UTC (rev 1946)
@@ -0,0 +1,40 @@
+Boot Parameters for Debian Live
+-------------------------------
+
+Updated for live-initramfs 1.87.6-1 on 2007-06-03.
+
+These options (can be combined) work from the ISOLINUX bootprompt:
+
+live access=v1|v2|v3|m1|m2 specify accessibility level
+live console=TTY,SPEED setting default console for live-getty
+live hostname=HOSTNAME override hostname value
+live integrity-check check media data integrity and md5sums
+live ip=IFACE,ADDRESS,NETMASK,GATEWAY specify network interface(s)
+live ip[=frommedia] skips dhcp/static, uses preconfiguration
+live keyb|kbd-chooser/method=KEYBOARD
+live klayout|console-setup/layoutcode=LAYOUT
+live kvariant|console-setup/variantcode=VARIANT
+live kmodel|console-setup/modelcode=CODE
+live koptions=OPTIONS
+live live-getty
+live live-media|bootfrom=DEVICE
+live live-media-encryption|encryption=TYPE
+live live-media-offset=BYTES
+live live-media-timeout=SECONDS
+live locale|debian-installer/local=LOCALE
+live module=NAME
+live netboot[=nfs|cifs]
+live noautologin
+live noxautologin
+live nopersistent
+live nosudo
+live noswap
+live persistent
+live quickreboot
+live showmounts
+live todisk=DEVICE
+live toram copy media to RAM and run from there
+live preseed/file|file=FILE
+live package/question=VALUE
+live xdebconf
+live xvideomode=RESOLUTION
More information about the Debian-live-changes
mailing list