[Debian-live-changes] r1152 - dists/sid releases/live-helper
releases/live-helper/1.0~a7-1 releases/live-helper/1.0~a7-1/debian
releases/live-helper/1.0~a7-1/doc
releases/live-helper/1.0~a7-1/examples
releases/live-helper/1.0~a7-1/functions
releases/live-helper/1.0~a7-1/helpers
releases/live-helper/1.0~a7-1/includes
releases/live-helper/1.0~a7-1/templates/syslinux
Daniel Baumann
daniel at alioth.debian.org
Tue Apr 24 07:56:42 UTC 2007
Author: daniel
Date: 2007-04-24 07:56:37 +0000 (Tue, 24 Apr 2007)
New Revision: 1152
Added:
releases/live-helper/1.0~a7-1/
releases/live-helper/1.0~a7-1/Makefile
releases/live-helper/1.0~a7-1/debian/changelog
releases/live-helper/1.0~a7-1/debian/cron.daily
releases/live-helper/1.0~a7-1/debian/default
releases/live-helper/1.0~a7-1/doc/ChangeLog
releases/live-helper/1.0~a7-1/doc/FAQ
releases/live-helper/1.0~a7-1/doc/NEWS
releases/live-helper/1.0~a7-1/examples/beryl-hook.sh
releases/live-helper/1.0~a7-1/examples/daily-cron.sh
releases/live-helper/1.0~a7-1/examples/etch+beryl-cron.sh
releases/live-helper/1.0~a7-1/examples/etch-cron.sh
releases/live-helper/1.0~a7-1/examples/weekly-cron.sh
releases/live-helper/1.0~a7-1/functions/arguments.sh
releases/live-helper/1.0~a7-1/functions/breakpoints.sh
releases/live-helper/1.0~a7-1/functions/chroot.sh
releases/live-helper/1.0~a7-1/functions/defaults.sh
releases/live-helper/1.0~a7-1/functions/echo.sh
releases/live-helper/1.0~a7-1/functions/exit.sh
releases/live-helper/1.0~a7-1/functions/package.sh
releases/live-helper/1.0~a7-1/functions/stagefile.sh
releases/live-helper/1.0~a7-1/helpers/lh_binary_chroot
releases/live-helper/1.0~a7-1/helpers/lh_binary_encryption
releases/live-helper/1.0~a7-1/helpers/lh_binary_grub
releases/live-helper/1.0~a7-1/helpers/lh_binary_iso
releases/live-helper/1.0~a7-1/helpers/lh_binary_memtest
releases/live-helper/1.0~a7-1/helpers/lh_binary_rootfs
releases/live-helper/1.0~a7-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a7-1/helpers/lh_binary_usb
releases/live-helper/1.0~a7-1/helpers/lh_binary_yaboot
releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_cdebootstrap
releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_debootstrap
releases/live-helper/1.0~a7-1/helpers/lh_chroot
releases/live-helper/1.0~a7-1/helpers/lh_chroot_hacks
releases/live-helper/1.0~a7-1/helpers/lh_chroot_localization
releases/live-helper/1.0~a7-1/helpers/lh_chroot_proc
releases/live-helper/1.0~a7-1/helpers/lh_chroot_sources
releases/live-helper/1.0~a7-1/helpers/lh_chroot_symlinks
releases/live-helper/1.0~a7-1/helpers/lh_chroot_sysfs
releases/live-helper/1.0~a7-1/helpers/lh_chroot_tasks
releases/live-helper/1.0~a7-1/helpers/lh_clean
releases/live-helper/1.0~a7-1/helpers/lh_config
releases/live-helper/1.0~a7-1/helpers/lh_losetup
releases/live-helper/1.0~a7-1/helpers/lh_source_usb
releases/live-helper/1.0~a7-1/helpers/lh_testroot
releases/live-helper/1.0~a7-1/helpers/make-live
releases/live-helper/1.0~a7-1/includes/sid
releases/live-helper/1.0~a7-1/templates/syslinux/isolinux.cfg
Removed:
dists/sid/live-helper/
releases/live-helper/1.0~a7-1/Makefile
releases/live-helper/1.0~a7-1/debian/changelog
releases/live-helper/1.0~a7-1/debian/cron.daily
releases/live-helper/1.0~a7-1/debian/default
releases/live-helper/1.0~a7-1/doc/ChangeLog
releases/live-helper/1.0~a7-1/doc/FAQ
releases/live-helper/1.0~a7-1/doc/NEWS
releases/live-helper/1.0~a7-1/examples/beryl-hook.sh
releases/live-helper/1.0~a7-1/functions/arguments.sh
releases/live-helper/1.0~a7-1/functions/breakpoints.sh
releases/live-helper/1.0~a7-1/functions/chroot.sh
releases/live-helper/1.0~a7-1/functions/defaults.sh
releases/live-helper/1.0~a7-1/functions/echo.sh
releases/live-helper/1.0~a7-1/functions/exit.sh
releases/live-helper/1.0~a7-1/functions/stagefile.sh
releases/live-helper/1.0~a7-1/helpers/lh_binary_chroot
releases/live-helper/1.0~a7-1/helpers/lh_binary_encryption
releases/live-helper/1.0~a7-1/helpers/lh_binary_grub
releases/live-helper/1.0~a7-1/helpers/lh_binary_iso
releases/live-helper/1.0~a7-1/helpers/lh_binary_memtest
releases/live-helper/1.0~a7-1/helpers/lh_binary_rootfs
releases/live-helper/1.0~a7-1/helpers/lh_binary_syslinux
releases/live-helper/1.0~a7-1/helpers/lh_binary_usb
releases/live-helper/1.0~a7-1/helpers/lh_binary_yaboot
releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_cdebootstrap
releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_debootstrap
releases/live-helper/1.0~a7-1/helpers/lh_chroot
releases/live-helper/1.0~a7-1/helpers/lh_chroot_hacks
releases/live-helper/1.0~a7-1/helpers/lh_chroot_localization
releases/live-helper/1.0~a7-1/helpers/lh_chroot_proc
releases/live-helper/1.0~a7-1/helpers/lh_chroot_sources
releases/live-helper/1.0~a7-1/helpers/lh_chroot_symlinks
releases/live-helper/1.0~a7-1/helpers/lh_chroot_sysfs
releases/live-helper/1.0~a7-1/helpers/lh_chroot_tasks
releases/live-helper/1.0~a7-1/helpers/lh_clean
releases/live-helper/1.0~a7-1/helpers/lh_config
releases/live-helper/1.0~a7-1/helpers/lh_losetup
releases/live-helper/1.0~a7-1/helpers/lh_source_usb
releases/live-helper/1.0~a7-1/helpers/lh_testroot
releases/live-helper/1.0~a7-1/helpers/make-live
releases/live-helper/1.0~a7-1/includes/sid
releases/live-helper/1.0~a7-1/templates/syslinux/isolinux.cfg
Log:
Copied: releases/live-helper/1.0~a7-1 (from rev 1103, dists/trunk/live-helper)
Deleted: releases/live-helper/1.0~a7-1/Makefile
===================================================================
--- dists/trunk/live-helper/Makefile 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/Makefile 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-
-all: install
-
-install:
- # Installing executables
- mkdir -p $(DESTDIR)/usr/bin
- cp helpers/lh_* helpers/make-live $(DESTDIR)/usr/bin
-
- # Installing shared data
- mkdir -p $(DESTDIR)/usr/share/live-helper
- cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
-
- # Installing documentation
- mkdir -p $(DESTDIR)/usr/share/doc/live-helper
- cp -r COPYING doc/* $(DESTDIR)/usr/share/doc/live-helper
-
- # Installing manpages
- set -e; for MANPAGE in manpages/*.1.en; \
- do \
- install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en`; \
- done
-
- set -e; for MANPAGE in manpages/*.7.en; \
- do \
- install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en`; \
- done
-
- set -e; for MANPAGE in manpages/*.1.de; \
- do \
- install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/de/man1/`basename $$MANPAGE .de`; \
- done
-
- set -e; for MANPAGE in manpages/*.7.de; \
- do \
- install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \
- done
-
-uninstall:
- # Uninstalling executables
- for HELPER in helpers/*; \
- do \
- rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \
- done
-
- # Uninstalling shared data
- rm -rf $(DESTDIR)/usr/share/live-helper
-
- # Uninstalling documentation
- rm -rf $(DESTDIR)/usr/share/doc/live-helper
-
- # Uninstalling manpages
- set -e; for MANPAGE in manpages/*.1.en; \
- do \
- rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en`; \
- done
-
- set -e; for MANPAGE in manpages/*.7.en; \
- do \
- rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en`; \
- done
-
- set -e; for MANPAGE in manpages/*.1.de; \
- do \
- rm -f $(DESTDIR)/usr/share/man/de/man1/`basename $$MANPAGE .de`; \
- done
-
- set -e; for MANPAGE in manpages/*.7.de; \
- do \
- rm -f $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \
- done
-
-clean:
-
-reinstall: uninstall install
Copied: releases/live-helper/1.0~a7-1/Makefile (from rev 1137, dists/trunk/live-helper/Makefile)
Deleted: releases/live-helper/1.0~a7-1/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/debian/changelog 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,61 +0,0 @@
-live-helper (1.0~a7-1) UNRELEASED; urgency=low
-
- * New upstream release.
-
- -- 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
-
- * Fixed typo in maintainer scripts.
-
- -- 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
-
- * helpers/lh_chroot_hacks: Added removal of udev persistent-net rule.
-
- -- Daniel Baumann <daniel at debian.org> Wed, 14 Mar 2007 21:00:00 +0100
-
-live-helper (1.0~a1-2) unstable; urgency=low
-
- * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT.
- * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to
- enabled.
-
- -- 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~a7-1/debian/changelog (from rev 1140, dists/trunk/live-helper/debian/changelog)
Deleted: releases/live-helper/1.0~a7-1/debian/cron.daily
===================================================================
--- dists/trunk/live-helper/debian/cron.daily 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/debian/cron.daily 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,128 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="daily"
-
-# Check for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
- exit 0
-fi
-
-# Check for live-helper defaults
-if [ -r /etc/default/live-helper ]
-then
- . /etc/default/live-helper
-else
- echo "E: /etc/default/live-helper missing."
- exit 1
-fi
-
-# Check for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
- exit 0
-fi
-
-# Check for build directory
-if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
-then
- mkdir -p "${AUTOBUILD_TEMPDIR}"
-else
- # FIXME: maybe we should just remove the left overs.
- echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
- exit 1
-fi
-
-for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
-do
- for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
- do
- for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
- do
- if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
- then
- # Generating images
- mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
- cd "${AUTOBUILD_TEMPDIR}"
- make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
- fi
-
- if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
- then
- # Moving logs
- mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
-
- # Moving images
- mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-
- mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
- fi
-
- if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
- then
- # Workaround of missing multi-binary support in live-helper
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
- rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
- mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
- touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
- touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
-
- # Generating images
- mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
- cd "${AUTOBUILD_TEMPDIR}"
- make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
- fi
-
- if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
- then
- # Moving logs
- mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
- cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
-
- # Moving images
- mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
- fi
-
- # Cleanup
- cd "${AUTOBUILD_TEMPDIR}"/debian-live
- lh_clean
- done
-
- # Cleanup
- cd "${AUTOBUILD_TEMPDIR}"/debian-live
- lh_clean purge
- done
-done
-
-# Cleanup
-if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
-then
- umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
- umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
-fi
-
-rm -rf "${AUTOBUILD_TEMPDIR}"
-
-# md5sums
-for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
-do
- cd "${DIRECTORY}"
- md5sum * > MD5SUMS
-done
-
-# Current symlink
-rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
Copied: releases/live-helper/1.0~a7-1/debian/cron.daily (from rev 1133, dists/trunk/live-helper/debian/cron.daily)
Deleted: releases/live-helper/1.0~a7-1/debian/default
===================================================================
--- dists/trunk/live-helper/debian/default 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/debian/default 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,15 +0,0 @@
-# Defaults for /etc/cron.daily/live-helper
-
-AUTOBUILD="disabled"
-
-AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
-AUTOBUILD_DISTRIBUTIONS="sid"
-AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-AUTOBUILD_OPTIONS="--apt-recommends disabled"
-
-AUTOBUILD_DATE="`date +%Y%m%d`"
-AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-AUTOBUILD_TEMPDIR="/srv/tmp"
-
-AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/"
-AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
Copied: releases/live-helper/1.0~a7-1/debian/default (from rev 1104, dists/trunk/live-helper/debian/default)
Deleted: releases/live-helper/1.0~a7-1/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/doc/ChangeLog 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,418 +0,0 @@
-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~a7-1/doc/ChangeLog (from rev 1140, dists/trunk/live-helper/doc/ChangeLog)
Deleted: releases/live-helper/1.0~a7-1/doc/FAQ
===================================================================
--- dists/trunk/live-helper/doc/FAQ 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/doc/FAQ 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,37 +0,0 @@
-Frequently Asked Questions (FAQ)
-================================
-
-Build Time
-----------
-
-Q: Is live-helper/make-live Debian specific?
-A: live-helper supports Debian and Ubuntu right now. Adding automatic defaults
- for other Debian derivatives is easy - let us know about them and we may
- include it.
-
-
-Q: How do I drop in to a shell during make-live chroot process?
-A: Use "--interactive shell", then exit with 'logout' when you have made the
- setting changes you want and the build process will continue.
-
-
-Q: Where to set the username or the hostname?
-A: casper uses default username 'casper' and hostname 'live'. You can specify
- them by passing 'username=' and 'hostname=' as kernel parameters.
-
- live-helper automatically sets the username to 'user' and the hostname to
- 'debian'. If you want to change this at build time, pass --username and
- --hostname to make-live, or alter LIVE_USERNAME and LIVE_HOSTNAME in
- config/image.
-
-
-Run Time
---------
-
-Q: What is the root password?
-A: There is none set. You can switch to root with 'sudo -i' or set a password
- with 'sudo passwd'.
-
-
-Q: What is the user password?
-A: The password for the default user is 'live'.
Copied: releases/live-helper/1.0~a7-1/doc/FAQ (from rev 1151, dists/trunk/live-helper/doc/FAQ)
Deleted: releases/live-helper/1.0~a7-1/doc/NEWS
===================================================================
--- dists/trunk/live-helper/doc/NEWS 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/doc/NEWS 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,27 +0,0 @@
-News:
-
- * 2006-02-14: Project announcement.
- http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative
-
- * 2006-02-28: Setup project resources.
- http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources
-
- * 2006-03-16: Added support for ISO image generation.
- http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html
-
- * 2006-06-02: Added support for netboot image generation.
- http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-May/000185.html
-
- * 2006-07-17: Uploaded first live-package to Debian unstable.
- http://packages.debian.org/changelogs/pool/main/l/live-package/current/changelog#versionversion0.99-1
-
- * 2007-02-05: Setup image autobuild server.
- http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html
-
- * 2007-02-10: Added support for USB image generation.
- http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html
-
- * 2007-02-17: Added support for encrypted live filesystem.
- http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html
-
- * 2007-03-12: Uploaded first live-helper to Debian unstable.
Copied: releases/live-helper/1.0~a7-1/doc/NEWS (from rev 1105, dists/trunk/live-helper/doc/NEWS)
Deleted: releases/live-helper/1.0~a7-1/examples/beryl-hook.sh
===================================================================
--- dists/trunk/live-helper/examples/beryl-hook.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/examples/beryl-hook.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install beryl and enable aixgl.
-# It was originally written by Inigo Tejedor Arrondo <inigo at navarrux.org>.
-#
-# To enable it, copy this hook into your config/chroot_localhooks directory.
-# At boot prompt, type 'live aixgl', press enter and have fun.
-
-# Import archive signing key
-wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add -
-
-# Update indices
-apt-get update
-
-# Install packages
-PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-plugins-unsupported beryl-settings beryl-settings-bindings beryl-settings-simple"
-
-if [ -f /usr/bin/gnome-session ]
-then
- PACKAGES="${PACKAGES} emerald emerald-themes heliodor"
-fi
-
-if [ -f /usr/bin/kstart ]
-then
- PACKAGES="${PACKAGES} aquamarine"
-fi
-
-apt-get install --yes ${PACKAGES}
-
-# Add init script
-cat > /etc/init.d/aixgl << EOF
-#!/bin/sh
-
-if cat /proc/cmdline | grep aixgl > /dev/null
-then
- echo "Configuring xorg for aixgl..."
-
- echo "" >> /etc/X11/xorg.conf
- echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf
- echo "Section \"Extensions\"" >> /etc/X11/xorg.conf
- echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf
- echo "EndSection" >> /etc/X11/xorg.conf
-
- sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf
-fi
-EOF
-
-chmod 0755 /etc/init.d/aixgl
-update-rc.d aixgl defaults
Copied: releases/live-helper/1.0~a7-1/examples/beryl-hook.sh (from rev 1114, dists/trunk/live-helper/examples/beryl-hook.sh)
Copied: releases/live-helper/1.0~a7-1/examples/daily-cron.sh (from rev 1133, dists/trunk/live-helper/examples/daily-cron.sh)
Copied: releases/live-helper/1.0~a7-1/examples/etch+beryl-cron.sh (from rev 1133, dists/trunk/live-helper/examples/etch+beryl-cron.sh)
Copied: releases/live-helper/1.0~a7-1/examples/etch-cron.sh (from rev 1133, dists/trunk/live-helper/examples/etch-cron.sh)
Copied: releases/live-helper/1.0~a7-1/examples/weekly-cron.sh (from rev 1133, dists/trunk/live-helper/examples/weekly-cron.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/arguments.sh
===================================================================
--- dists/trunk/live-helper/functions/arguments.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/arguments.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# arguments.sh - handle common arguments
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Arguments ()
-{
- ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,logfile:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
-
- if [ "${?}" != "0" ]
- then
- Echo_error "terminating" >&2
- exit 1
- fi
-
- eval set -- "${ARGUMENTS}"
-
- while true
- do
- case "${1}" in
- --breakpoints)
- LH_BREAKPOINTS="enabled"; shift
- ;;
-
- --conffile)
- LH_CONFFILE="${2}"; shift 2
- ;;
-
- --debug)
- LH_DEBUG="enabled"; shift
- ;;
-
- --force)
- LH_FORCE="enabled"; shift
- ;;
-
- -h|--help)
- Help; shift
- ;;
-
- --logfile)
- LH_LOGFILE="${2}"; shift 2
- ;;
-
- --quiet)
- LH_QUIET="enabled"; shift
- ;;
-
- -u|--usage)
- Usage; shift
- ;;
-
- --verbose)
- LH_VERBOSE="enabled"; shift
- ;;
-
- -v|--version)
- Version; shift
- ;;
-
- --)
- shift; break
- ;;
-
- *)
- Echo_error "internal error"
- exit 1
- ;;
- esac
- done
-}
Copied: releases/live-helper/1.0~a7-1/functions/arguments.sh (from rev 1140, dists/trunk/live-helper/functions/arguments.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/breakpoints.sh
===================================================================
--- dists/trunk/live-helper/functions/breakpoints.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/breakpoints.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# breakpoints.sh - run with breakpoints
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-Breakpoint ()
-{
- if [ "${LH_BREAKPOINTS}" = "enabled" ]
- then
- BREAKPOINT="${1}"
-
- Echo_message "Waiting at ${BREAKPOINT}"
- read
- fi
-}
Copied: releases/live-helper/1.0~a7-1/functions/breakpoints.sh (from rev 1135, dists/trunk/live-helper/functions/breakpoints.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/chroot.sh
===================================================================
--- dists/trunk/live-helper/functions/chroot.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/chroot.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# chroot.sh - /usr/sbin/chroot wrapper script
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Chroot ()
-{
- COMMANDS="${1}"
-
- # Executing commands in chroot
- Echo_debug "Executing: ${COMMANDS}"
- chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
-}
Copied: releases/live-helper/1.0~a7-1/functions/chroot.sh (from rev 1140, dists/trunk/live-helper/functions/chroot.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/defaults.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,609 +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 [ -f /usr/bin/lsb_release ]
- then
- case "`lsb_release --short --id`" in
- Debian)
- LH_MODE="debian"
- ;;
-
- Ubuntu)
- LH_MODE="ubuntu"
- ;;
- esac
- else
- LH_MODE="debian"
- fi
- fi
-
- # Setting package manager
- if [ -z "${LH_APT}" ]
- then
- LH_APT="aptitude"
- fi
-
- # 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 indices
- if [ -z "${LH_APT_GENERIC}" ]
- then
- LH_APT_GENERIC="enabled"
- fi
-
- # Setting apt pdiffs
- if [ -z "${LH_APT_PDIFFS}" ]
- then
- LH_APT_PDIFFS="enabled"
- fi
-
- # Setting apt recommends
- if [ -z "${LH_APT_RECOMMENDS}" ]
- then
- LH_APT_RECOMMENDS="enabled"
- fi
-
- # Setting apt secure
- if [ -z "${LH_APT_SECURE}" ]
- then
- LH_APT_SECURE="enabled"
- fi
-
- # 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/sbin/debootstrap" ]
- then
- if [ -f /usr/lib/debootstrap/scripts/feisty ]
- then
- LH_BOOTSTRAP="debootstrap"
- else
- echo "E: Your version of debootstrap does not support ubuntu."
- exit 1
- fi
- else
- echo "E: You need to install debootstrap from Ubuntu in order to bootstrap ubuntu."
- exit 1
- fi
- ;;
- esac
- fi
-
- # Setting cache option
- if [ -z "${LH_CACHE}" ]
- then
- LH_CACHE="enabled"
- fi
-
- # Setting debconf frontend
- if [ -z "${LH_DEBCONF_FRONTEND}" ]
- then
- LH_DEBCONF_FRONTEND="noninteractive"
- fi
-
- if [ -z "${LH_DEBCONF_PRIORITY}" ]
- then
- LH_DEBCONF_PRIORITY="critical"
- fi
-
- if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
- then
- LH_DEBCONF_NOWARNINGS="yes"
- fi
-
- # Setting genisoimage
- if [ -z "${LH_GENISOIMAGE}" ]
- then
- case "${LH_MODE}" in
- debian)
- LH_GENISOIMAGE="genisoimage"
- ;;
-
- ubuntu)
- LH_GENISOIMAGE="mkisofs"
- ;;
- esac
- fi
-
- # Setting losetup
- if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
- then
- # Check 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
-
- # Setting tasksel
- if [ -z "${LH_TASKSEL}" ]
- then
- LH_TASKSEL="aptitude"
- fi
-
- # 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 live helper options
- if [ -z "${LH_BREAKPOINTS}" ]
- then
- LH_BREAKPOINTS="disabled"
- fi
-
- if [ -z "${LH_DEBUG}" ]
- then
- LH_DEBUG="disabled"
- fi
-
- if [ -z "${LH_FORCE}" ]
- then
- LH_FORCE="disabled"
- fi
-
- if [ -z "${LH_QUIET}" ]
- then
- LH_QUIET="disabled"
- fi
-
- if [ -z "${LH_VERBOSE}" ]
- then
- LH_VERBOSE="disabled"
- fi
-
- ## config/bootstrap
-
- # Setting architecture value
- if [ -z "${LIVE_ARCHITECTURE}" ]
- then
- if [ -x "/usr/bin/dpkg" ]
- then
- LIVE_ARCHITECTURE="`dpkg --print-architecture`"
- else
- echo "E: Can't process file /usr/bin/dpkg (FIXME)"
- 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 distribution configuration value
- # LIVE_BOOTSTRAP_CONFIG
-
- # Setting flavour value
- if [ -z "${LIVE_BOOTSTRAP_FLAVOUR}" ]
- then
- LIVE_BOOTSTRAP_FLAVOUR="standard"
- fi
-
- # Setting mirror to fetch packages from
- if [ -z "${LIVE_MIRROR_BUILD}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BUILD="http://ftp.debian.org/debian/"
- ;;
-
- ubuntu)
- LIVE_MIRROR_BUILD="http://archive.ubuntu.com/ubuntu/"
- ;;
- esac
- fi
-
- # Setting security mirror to fetch packages from
- if [ -z "${LIVE_MIRROR_BUILD_SECURITY}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_BUILD_SECURITY="http://security.debian.org/"
- ;;
-
- ubuntu)
- LIVE_MIRROR_BUILD_SECURITY="http://security.ubuntu.org/ubuntu/"
- ;;
- esac
- fi
-
- # Setting mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_IMAGE}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_IMAGE="http://ftp.debian.org/debian/"
- ;;
-
- ubuntu)
- LIVE_MIRROR_IMAGE="http://archive.ubuntu.com/ubuntu/"
- ;;
- esac
- fi
-
- # Setting security mirror which ends up in the image
- if [ -z "${LIVE_MIRROR_IMAGE_SECURITY}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_MIRROR_IMAGE_SECURITY="http://security.debian.org/"
- ;;
-
- ubuntu)
- LIVE_MIRROR_IMAGE_SECURITY="http://security.ubuntu.com/ubuntu/"
- ;;
- esac
- fi
-
- # Setting sections value
- if [ -z "${LIVE_SECTIONS}" ]
- then
- LIVE_SECTIONS="main"
- fi
-
- ## config/chroot
-
- # Setting interactive shell/X11/Xnest
- if [ -z "${LIVE_INTERACTIVE}" ]
- then
- LIVE_INTERACTIVE="disabled"
- fi
-
- # Setting kernel flavour string
- if [ -z "${LIVE_KERNEL_FLAVOUR}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- alpha)
- LIVE_KERNEL_FLAVOUR="alpha-generic"
- ;;
-
- amd64)
- case "${LH_MODE}" in
- debian)
- LIVE_KERNEL_FLAVOUR="amd64"
- ;;
-
- ubuntu)
- LIVE_KERNEL_FLAVOUR="amd64-generic"
- ;;
- esac
- ;;
-
- arm)
- echo "E: You need to specify the linux kernel flavour manually on arm (FIXME)."
- exit 1
- ;;
-
- hppa)
- LIVE_KERNEL_FLAVOUR="parisc"
- ;;
-
- i386)
- case "${LH_MODE}" in
- debian)
- LIVE_KERNEL_FLAVOUR="486"
- ;;
-
- ubuntu)
- LIVE_KERNEL_FLAVOUR="386"
- ;;
- esac
- ;;
-
- ia64)
- LIVE_KERNEL_FLAVOUR="itanium"
- ;;
-
- m68k)
- LIVE_KERNEL_FLAVOUR="E: You need to specify the linux kernel flavour manually on m68k."
- exit 1
- ;;
-
- powerpc)
- LIVE_KERNEL_FLAVOUR="powerpc"
- ;;
-
- s390)
- LIVE_KERNEL_FLAVOUR="s390"
- ;;
-
- sparc)
- case "${LH_MODE}" in
- debian)
- LIVE_KERNEL_FLAVOUR="sparc32"
- ;;
-
- ubuntu)
- LIVE_KERNEL_FLAVOUR="sparc64"
- ;;
- esac
- ;;
-
- *)
- echo "E: Architecture notyet supported (FIXME)"
- ;;
- esac
- fi
-
- # Set kernel packages
- if [ -z "${LIVE_KERNEL_PACKAGES}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_KERNEL_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
- ;;
-
- ubuntu)
- LIVE_KERNEL_PACKAGES="linux-image"
- ;;
- esac
-
- if [ -n "${LIVE_ENCRYPTION}" ]
- then
- LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES} loop-aes-modules-2.6"
- fi
- fi
-
- # Setting keyring packages
- # LIVE_KEYRING_PACKAGES
-
- # Setting language string
- # LIVE_LANGUAGE
-
- # Setting tasks
- # LIVE_TASKS
-
- # Setting packages string
- # LIVE_PACKAGES
-
- # Setting packages list string
- if [ -z "${LIVE_PACKAGES_LISTS}" ]
- then
- LIVE_PACKAGES_LISTS="standard"
- fi
-
- # 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'`"
-
- # LIVE_HOOKS
-
- # Setting security updates option
- if [ -z "${LIVE_SECURITY}" ]
- then
- LIVE_SECURITY="enabled"
- fi
-
- # Setting symlink convertion option
- if [ -z "${LIVE_SYMLINKS}" ]
- then
- LIVE_SYMLINKS="disabled"
- fi
-
- # Setting sysvinit option
- if [ -z "${LIVE_SYSVINIT}" ]
- then
- LIVE_SYSVINIT="disabled"
- fi
-
- ## config/image
-
- # Setting boot parameters
- # LIVE_BOOTAPPEND
-
- # Setting encryption
- # LIVE_ENCRYPTION
-
- # Setting username
- if [ -z "${LIVE_USERNAME}" ]
- then
- LIVE_USERNAME="user"
- fi
-
- # Setting hostname
- if [ -z "${LIVE_HOSTNAME}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_HOSTNAME="debian"
- ;;
-
- ubuntu)
- LIVE_HOSTNAME="ubuntu"
- ;;
- esac
- fi
-
- # Setting image type
- if [ -z "${LIVE_BINARY_IMAGE}" ]
- then
- LIVE_BINARY_IMAGE="iso"
- fi
-
- # Setting image type
- if [ -z "${LIVE_SOURCE_IMAGE}" ]
- then
- LIVE_SOURCE_IMAGE="generic"
- fi
-
- # Setting filesystem
- if [ -z "${LIVE_FILESYSTEM}" ]
- then
- LIVE_FILESYSTEM="squashfs"
- fi
-
- # Setting memtest option
- if [ -z "${LIVE_MEMTEST}" ]
- then
- LIVE_MEMTEST="memtest86+"
- fi
-
- # Setting iso volume
- if [ -z "${LIVE_ISO_VOLUME}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d\`"
- ;;
-
- ubuntu)
- LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d\`"
- ;;
- esac
- fi
-
- # Setting netboot server address
- if [ -z "${LIVE_SERVER_ADDRESS}" ]
- then
- LIVE_SERVER_ADDRESS="192.168.1.1"
- fi
-
- # Setting netboot server path
- if [ -z "${LIVE_SERVER_PATH}" ]
- then
- case "${LH_MODE}" in
- debian)
- LIVE_SERVER_PATH="/srv/debian-live"
- ;;
-
- ubuntu)
- LIVE_SERVER_PATH="/srv/ubuntu-live"
- ;;
- esac
- fi
-
- # Setting source option
- if [ -z "${LIVE_SOURCE}" ]
- then
- LIVE_SOURCE="disabled"
- fi
-
- # Setting grub
- if [ -z "${LIVE_BOOTLOADER}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- LIVE_BOOTLOADER="syslinux"
- ;;
-
- powerpc)
- LIVE_BOOTLOADER="yaboot"
- ;;
- esac
- fi
-
- # Setting grub splash
- # LIVE_GRUB_SPLASH
-
- # Setting syslinux splash
- # LIVE_SYSLINUX_SPLASH
-
- # Setting includes
- if [ -z "${LIVE_INCLUDES}" ]
- then
- LIVE_INCLUDES="/usr/share/live-helper/includes"
- fi
-
- # Setting templates
- if [ -z "${LIVE_TEMPLATES}" ]
- then
- LIVE_TEMPLATES="/usr/share/live-helper/templates"
- fi
-}
Copied: releases/live-helper/1.0~a7-1/functions/defaults.sh (from rev 1148, dists/trunk/live-helper/functions/defaults.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/echo.sh
===================================================================
--- dists/trunk/live-helper/functions/echo.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/echo.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# echo.sh - define output methods
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Echo_debug ()
-{
- if [ "${LH_DEBUG}" = "enabled" ]
- then
- echo "D: ${@}"
- fi
-}
-
-Echo_error ()
-{
- echo "E: ${@}"
-}
-
-Echo_message ()
-{
- if [ "${LH_QUIET}" != "enabled" ]
- then
- echo "P: ${@}"
- fi
-}
-
-Echo_verbose ()
-{
- if [ "${LH_VERBOSE}" = "enabled" ]
- then
- echo "I: ${@}"
- fi
-}
-
-Echo_warning ()
-{
- echo "W: ${@}"
-}
Copied: releases/live-helper/1.0~a7-1/functions/echo.sh (from rev 1135, dists/trunk/live-helper/functions/echo.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/exit.sh
===================================================================
--- dists/trunk/live-helper/functions/exit.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/exit.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# exit.sh - cleanup
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Exit ()
-{
- if [ "${LH_DEBUG}" = "enabled" ]
- then
- set | grep -e ^LH -e ^LIVE
- fi
-
- # FIXME: Add /proc et al cleanup on failure
-}
Copied: releases/live-helper/1.0~a7-1/functions/exit.sh (from rev 1135, dists/trunk/live-helper/functions/exit.sh)
Copied: releases/live-helper/1.0~a7-1/functions/package.sh (from rev 1135, dists/trunk/live-helper/functions/package.sh)
Deleted: releases/live-helper/1.0~a7-1/functions/stagefile.sh
===================================================================
--- dists/trunk/live-helper/functions/stagefile.sh 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/functions/stagefile.sh 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# stagefile.sh - handle stage files
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Check_stagefile ()
-{
- FILE="${1}"
- NAME="`basename ${1}`"
-
- # Checking stage file
- if [ -f "${FILE}" ]
- then
- if [ "${LH_FORCE}" = "enabled" ]
- then
- # Forcing execution
- rm -f "${FILE}"
- else
- # Skipping execution
- Echo_warning "skipping ${NAME}"
- exit 0
- fi
- fi
-}
-
-Create_stagefile ()
-{
- FILE="${1}"
- DIRECTORY="`dirname ${1}`"
-
- # Creating stage directory
- if [ ! -d "${DIRECTORY}" ]
- then
- mkdir -p "${DIRECTORY}"
- fi
-
- # Creating stage file
- touch "${FILE}"
-}
-
-Require_stagefile ()
-{
- FILE="${1}"
- NAME="`basename ${1}`"
-
- # Checking stage file
- if [ ! -f "${FILE}" ]
- then
- Echo_error "${NAME} missing"
- exit 1
- fi
-}
Copied: releases/live-helper/1.0~a7-1/functions/stagefile.sh (from rev 1135, dists/trunk/live-helper/functions/stagefile.sh)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_chroot 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,69 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="copy chroot into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "binary_chroot: Init"
-
-# 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, proc is not mounted here, but people tend to be lazy
-if [ -f chroot/proc/version ]
-then
- umount chroot/proc
-fi
-
-if [ -d chroot/sys/kernel ]
-then
- umount chroot/sys
-fi
-
-# Removing old chroot
-rm -rf chroot/chroot
-rm -rf chroot.tmp
-
-# Copying new chroot
-Echo_message "Copying chroot, this can take a while."
-cp -a chroot chroot.tmp
-mv chroot.tmp chroot/chroot
-
-# Creating stage file
-Create_stagefile .stage/binary_chroot
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_chroot (from rev 1150, dists/trunk/live-helper/helpers/lh_binary_chroot)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_encryption 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,130 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="encrypts rootfs"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-if [ -z "${LIVE_ENCRYPTION}" ]
-then
- exit 0
-fi
-
-Breakpoint "binary_encryption: Init"
-
-# 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 "${LIVE_FILESYSTEM}" in
- ext2)
- ROOTFS="ext2"
- ;;
-
- plain)
- Echo_warning "encryption not supported on plain filesystem."
- exit 0
- ;;
-
- squashfs)
- ROOTFS="squashfs"
- ;;
-esac
-
-if [ ! -f chroot/usr/bin/aespipe ]
-then
- PACKAGES="${PACKAGES} aespipe"
-fi
-
-if [ -n "${PACKAGES}" ]
-then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Moving image
-mv binary/casper/filesystem.${LIVE_FILESYSTEM} chroot
-
-echo "Encrypting binary/casper/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
-
-cat >> chroot/encrypt << EOF
-while true
-do
- cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > 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"
-
-# Move image
-mv chroot/filesystem.${LIVE_FILESYSTEM} binary/casper
-rm -f chroot/encrypt
-
-# Removing packages
-if [ -n "${PACKAGES}" ]
-then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_encryption
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_encryption (from rev 1135, dists/trunk/live-helper/helpers/lh_binary_encryption)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_grub 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,236 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs grub into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "grub" ]
-then
- exit 0
-fi
-
-Breakpoint "binary_grub: Init"
-
-# 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 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
-
-if [ ! -f chroot/usr/sbin/grub ]
-then
- PACKAGES="${PACKAGES} grub"
-fi
-
-if [ -n "${PACKAGES}" ]
-then
- # Installing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
- iso|usb|hdd)
- DESTDIR="binary/live"
- ;;
-
- net)
- Echo_error "not supported, aborting (FIXME)."
- exit 1
- ;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
- esac
- fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-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_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-LINUX="title\t\tDebian GNU/Linux - Live\nkernel\t\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=casper LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live (failsafe mode)\nkernel\t\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-
-if [ "`echo ${LIVE_KERNEL_FLAVOUR} | 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}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (failsafe mode)\nkernel\t\t/`basename ${DESTDIR}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR}`/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}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (failsafe mode)\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- fi
- done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR}"/memtest ]
-then
- MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR}`/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_IMAGE} in
- iso)
- cp chroot/usr/lib/grub/i386-pc/stage2_eltorito binary/boot/grub
- ;;
-
- usb|hdd)
- cp chroot/usr/lib/grub/i386-pc/stage1 chroot/usr/lib/grub/i386-pc/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 -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
-# This is a divider, added to separate the menu items below from the Debian
-# ones.
-title Other:
-root
-
-LIVE_MEMTEST
-EOF
-
-sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
-sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
-
-if [ -n "${PACKAGES}" ]
-then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
-esac
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_grub
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_grub (from rev 1135, dists/trunk/live-helper/helpers/lh_binary_grub)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_iso 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,120 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="build iso binary image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-for IMAGE in ${LIVE_BINARY_IMAGE}
-do
- if [ "${IMAGE}" = "iso" ]
- then
- Breakpoint "binary_iso: Init"
-
- # 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
-
- if [ ! -f chroot/usr/bin/"${LH_GENISOIMAGE}" ]
- then
- PACKAGES="${PACKAGES} ${LH_GENISOIMAGE}"
- fi
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Remove old iso image
- if [ -f binary.iso ]
- then
- rm -f binary.iso
- fi
-
- # Moving image
- mv binary chroot
-
- # Create image
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
- then
- case "${LIVE_BOOTLOADER}" in
- grub)
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- ;;
-
- syslinux)
- #Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- ;;
- esac
- else
- Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
- sleep 5
- #Chroot "${LH_GENISOIMAGE} -A 'Debian Live' -p 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l binary"
- fi
-
- # Move image
- mv chroot/binary chroot/binary.iso ./
-
- # Removing packages
- if [ -n "${PACKAGES}" ]
- then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Creating stage file
- Create_stagefile .stage/binary_iso
- fi
-done
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_iso (from rev 1135, dists/trunk/live-helper/helpers/lh_binary_iso)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_memtest 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,150 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs a memtest into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-if [ "${LIVE_MEMTEST}" = "disabled" ]
-then
- exit 0
-fi
-
-Breakpoint "binary_memtest: Init"
-
-# 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
-
-case "${LIVE_MEMTEST}" in
- memtest86)
- if [ ! -f chroot/boot/memtest86.bin ]
- then
- PACKAGES="${PACKAGES} memtest86"
- fi
- ;;
-
- memtest86+)
- if [ ! -f chroot/boot/memtest86+.bin ]
- then
- PACKAGES="${PACKAGES} memtest86+"
- fi
- ;;
-esac
-
-if [ -n "${PACKAGES}" ]
-then
- # Installing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb|hdd)
- DESTDIR="binary"
- ;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
- esac
- fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
-
-# 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
-
-if [ -n "${PACKAGES}" ]
-then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_memtest
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_memtest (from rev 1135, dists/trunk/live-helper/helpers/lh_binary_memtest)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_rootfs 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,170 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="build rootfs image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "binary_rootfs: Init"
-
-# 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
-
-# Creating directory
-if [ ! -d binary/casper ]
-then
- mkdir -p binary/casper
-fi
-
-case "${LIVE_FILESYSTEM}" in
- ext2)
- if [ ! -f chroot/usr/bin/genext2fs ]
- then
- PACKAGES="${PACKAGES} genext2fs"
- fi
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Remove old ext2 image
- if [ -f binary/casper/filesystem.ext2 ]
- then
- rm -f binary/casper/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/casper
- rm -rf chroot/chroot
-
- # Removing packages
- if [ -n "${PACKAGES}" ]
- then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
- ;;
-
- plain)
- if [ -d binary/casper/filesystem.dir ]
- then
- rm -rf binary/casper/filesystem.dir
- fi
-
- mv chroot/chroot binary/casper/filesystem.dir
- ;;
-
- squashfs)
- if [ ! -f chroot/usr/sbin/mksquashfs ]
- then
- PACKAGES="${PACKAGES} squashfs-tools"
- fi
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Remove old squashfs image
- if [ -f binary/casper/filesystem.squashfs ]
- then
- rm -f binary/casper/filesystem.squashfs
- fi
-
- # Create image
- if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
- then
- Chroot "mksquashfs chroot filesystem.squashfs"
- else
- Chroot "mksquashfs chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
- fi
-
- # Move image
- mv chroot/filesystem.squashfs binary/casper
- rm -rf chroot/chroot
-
- # Removing packages
- if [ -n "${PACKAGES}" ]
- then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
- ;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_rootfs
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_rootfs (from rev 1150, dists/trunk/live-helper/helpers/lh_binary_rootfs)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_syslinux 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,373 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs syslinux into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
-then
- exit 0
-fi
-
-Breakpoint "binary_syslinux: Init"
-
-# 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
-
-# Check 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
-
-if [ ! -f chroot/usr/bin/syslinux ]
-then
- PACKAGES="${PACKAGES} syslinux"
-fi
-
-if [ -n "${PACKAGES}" ]
-then
- # Installing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net)
- DESTDIR="tftpboot"
- ;;
-
- usb|hdd)
- DESTDIR="binary"
- ;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
- # Assembling multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
- esac
- fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-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_IMAGE}" = "iso" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
- LINUX="label LIVE\n kernel /`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
- LINUX="${LINUX}\nlabel LIVE-failsafe\n kernel /`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
-else
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
- LINUX="label LIVE\n kernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n append initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
- LINUX="${LINUX}\nlabel LIVE-failsafe\n kernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n append initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
-fi
-
-if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGE}" = "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=casper LIVE_BOOTAPPEND"
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
- 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=casper LIVE_BOOTAPPEND"
- 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=casper LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
- else
- if [ "${LIVE_BINARY_IMAGE}" = "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=casper LIVE_BOOTAPPEND"
- LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
- 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=casper LIVE_BOOTAPPEND"
- 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=casper LIVE_BOOTAPPEND ${FAILSAFE}"
- fi
- fi
- done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR}"/memtest ]
-then
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
- then
- MEMTEST="label memtest\n kernel /`basename ${DESTDIR}`/memtest"
- MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
- else
- MEMTEST="label memtest\n kernel memtest"
- fi
-fi
-
-case "${LIVE_BINARY_IMAGE}" 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/isolinux.txt
- else
- cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
- fi
- fi
-
- # Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_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_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
- 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/isolinux/isolinux.cfg
- done
- else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" 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/isolinux.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/isolinux.txt
- else
- cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
- fi
- fi
-
- # Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
- sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_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_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
- 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/" tftpboot/pxelive.cfg/default
- done
- else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" tftpboot/pxelinux.cfg/default
- fi
- ;;
-
- usb|hdd)
- # Copying syslinux
- mkdir -p binary
- cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
- cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
- mv binary/isolinux.cfg binary/syslinux.cfg
- mv binary/isolinux.txt binary/syslinux.txt
- sed -i -e "s/isolinux.txt/syslinux.txt/" binary/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 binary/splash.rle
- sed -e "s/.*splash.*//" binary/syslinux.txt
- else
- cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
- fi
- fi
-
- # Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
- sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
-
- # Remove unused files
- rm -f binary/pxelinux.cfg
-
- # Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
- 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/syslinux.cfg
- done
- else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/syslinux.cfg
- fi
- ;;
-esac
-
-if [ -n "${PACKAGES}" ]
-then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_syslinux (from rev 1135, dists/trunk/live-helper/helpers/lh_binary_syslinux)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_usb 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,195 +0,0 @@
-#!/bin/sh
-
-# lh_binary_usb(1) - build 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="build binary image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "binary_usb: Init"
-
-for IMAGE in ${LIVE_BINARY_IMAGE}
-do
- if [ "${IMAGE}" = "usb" ]
- then
- # Requiring stage file
- Require_stagefile .stage/bootstrap
- Require_stagefile .stage/chroot_proc
-
- # Checking stage file
- Check_stagefile .stage/binary_usb
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ ! -f chroot/sbin/mkdosfs ]
- then
- PACKAGES="${PACKAGES} dosfstools"
- fi
-
- if [ ! -f chroot/usr/bin/mtools ]
- then
- PACKAGES="${PACKAGES} mtools"
- fi
-
- if [ ! -f chroot/sbin/parted ]
- then
- PACKAGES="${PACKAGES} parted"
- fi
-
- case "${LIVE_BOOTLOADER}" in
- grub)
- if [ ! -f chroot/usr/sbin/grub ]
- then
- PACKAGES="${PACKAGES} grub"
- fi
- ;;
-
- syslinux)
- if [ ! -f chroot/usr/bin/syslinux ]
- then
- PACKAGES="${PACKAGES} syslinux"
- fi
- ;;
- esac
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # 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} / 20`" # Just 5% 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.msdos -n DEBIAN_LIVE ${FREELO}"
- mkdir -p binary.tmp
- mount ${FREELO} binary.tmp
- cp -r binary/* binary.tmp
- 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
-
- if [ -n "${PACKAGES}" ]
- then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Creating stage file
- Create_stagefile .stage/binary_usb
- fi
-done
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_usb (from rev 1140, dists/trunk/live-helper/helpers/lh_binary_usb)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_binary_yaboot 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,217 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs yaboot into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
-then
- exit 0
-fi
-
-Breakpoint "binary_yaboot: Init"
-
-# 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 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
-
-if [ ! -f chroot/usr/lib/yaboot/yaboot ]
-then
- PACKAGES="${PACKAGES} yaboot"
-fi
-
-if [ -n "${PACKAGES}" ]
-then
- # Installing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
- iso)
- DESTDIR="binary/live"
- ;;
-
- net|usb|hdd)
- Echo_error "not supported, FIXME"
- ;;
-esac
-
-# Temporary check for broken yaboot
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
- case "${LIVE_ARCHITECTURE}" in
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
- mkdir -p "${DESTDIR}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | 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=casper LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-else
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | 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=casper LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-fi
-
-# FIXME
-if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
-then
- for KERNEL in chroot/boot/vmlinuz*
- do
- if [ -z "${LINUX}" ]
- then
- if [ "${LIVE_BINARY_IMAGE}" = "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=casper 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=casper LIVE_BOOTAPPEND"
- fi
- else
- if [ "${LIVE_BINARY_IMAGE}" = "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=casper 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=casper LIVE_BOOTAPPEND"
- fi
- fi
- done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-case "${LIVE_BINARY_IMAGE}" 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_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_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_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
- 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_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
- fi
- ;;
-esac
-
-if [ -n "${PACKAGES}" ]
-then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot
Copied: releases/live-helper/1.0~a7-1/helpers/lh_binary_yaboot (from rev 1135, dists/trunk/live-helper/helpers/lh_binary_yaboot)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_cdebootstrap 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,167 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="bootstrap a Debian system with cdebootstrap(1)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "bootstrap_cdeboostrap: Init"
-
-if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
-then
- exit 0
-fi
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-if [ ! -d chroot ]
-then
- mkdir -p chroot
-fi
-
-# 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 [ "${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
- if [ "${LH_CACHE}" = "enabled" ]
- then
- # Restore old cache
- if [ -d cache/chroot_bootstrap ]
- then
- cp -a cache/chroot_bootstrap/* chroot
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
-
- if [ -d cache/bootstrap ]
- then
- mkdir -p chroot/var/cache/bootstrap
- cp cache/bootstrap/*.deb chroot/var/cache/bootstrap
- fi
-
- # Executing cdebootstrap (download-only)
- cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
-
- # Removing old cache
- if [ -d cache/bootstrap ]
- then
- rm -f cache/bootstrap/*.deb
- fi
-
- # Saving new cache
- if [ ! -d cache/bootstrap ]
- then
- mkdir -p cache/bootstrap
- fi
-
- cp chroot/var/cache/bootstrap/*.deb cache/bootstrap
- fi
-
- # Executing cdebootstrap (regular run)
- cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
-
- # 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
- if [ -d chroot/var/cache/bootstrap ]
- then
- rm -rf chroot/var/cache/bootstrap
- fi
-
- # Saving new cache
- if [ "${LH_CACHE}" = "enabled" ]
- then
- if [ -d cache/chroot_bootstrap ]
- then
- rm -rf cache/chroot_bootstrap
- fi
-
- cp -a chroot cache/chroot_bootstrap
- fi
-
- # 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~a7-1/helpers/lh_bootstrap_cdebootstrap (from rev 1150, dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_bootstrap_debootstrap 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,136 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="bootstrap a Debian system with debootstrap(8)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "bootstrap_debootstrap: Init"
-
-if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
-then
- exit 0
-fi
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-if [ ! -d chroot ]
-then
- mkdir -p chroot
-fi
-
-# 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
- if [ "${LH_CACHE}" = "enabled" ]
- then
- # Restore old cache
- if [ -d cache/chroot_bootstrap ]
- then
- cp -a cache/chroot_bootstrap/* chroot
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
-
- if [ -d cache/bootstrap ]
- then
- mkdir -p chroot/var/cache/apt/archives
- cp cache/bootstrap/*.deb chroot/var/cache/apt/archives
- fi
-
- # Executing debootstrap (download-only)
- debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
-
- # Removing old cache
- if [ -d cache/bootstrap ]
- then
- rm -f cache/bootstrap/*.deb
- fi
-
- # Saving new cache
- if [ ! -d cache/bootstrap ]
- then
- mkdir -p cache/bootstrap
- fi
-
- cp chroot/var/cache/apt/archives/*.deb cache/bootstrap
- fi
-
- # Executing debootstrap (regular run)
- debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
-
- # Removing bootstrap cache
- rm -rf chroot/var/cache/apt/archives/*.deb
-
- # Saving new cache
- if [ "${LH_CACHE}" = "enabled" ]
- then
- if [ -d cache/chroot_bootstrap ]
- then
- rm -rf cache/chroot_bootstrap
- fi
-
- cp -a chroot cache/chroot_bootstrap
- fi
-
- # 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~a7-1/helpers/lh_bootstrap_debootstrap (from rev 1150, dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,71 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="customize the Debian system"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot: Init"
-
-# 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_linuximage install "${@}"
-
-# Customizing chroot
-lh_chroot_tasks "${@}"
-lh_chroot_packageslists "${@}"
-lh_chroot_packages "${@}"
-lh_chroot_localpackages "${@}"
-lh_chroot_localpackageslists "${@}"
-lh_chroot_localization "${@}"
-lh_chroot_hacks "${@}"
-lh_chroot_localincludes "${@}"
-lh_chroot_sysvinit "${@}"
-lh_chroot_hooks "${@}"
-lh_chroot_localhooks "${@}"
-lh_chroot_symlinks "${@}"
-lh_chroot_interactive "${@}"
-
-# Deconfiguring chroot
-lh_chroot_linuximage 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~a7-1/helpers/lh_chroot (from rev 1149, dists/trunk/live-helper/helpers/lh_chroot)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_hacks 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,86 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="execute hacks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_hacks: Init"
-
-# 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
-rm -f chroot/etc/udev/rules.d/z25_persistent-net.rules
-
-case "${LIVE_BINARY_IMAGE}" 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"
-
-# Creating stage file
-Create_stagefile .stage/chroot_hacks
Copied: releases/live-helper/1.0~a7-1/helpers/lh_chroot_hacks (from rev 1150, dists/trunk/live-helper/helpers/lh_chroot_hacks)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_localization 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,700 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install localization packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_localization: Init"
-
-# 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
- if [ -z "${ICEAPE}" ]
- then
- ICEAPE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${ICEDOCE}" ]
- then
- ICEDOVE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${ICEWEASEL}" ]
- then
- ICEWEASEL="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${KDE}" ]
- then
- KDE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${KOFFICE}" ]
- then
- KOFFICE="${LIVE_LANGUAGE}"
- fi
-
- if [ -z "${OPENOFFICE}" ]
- then
- OPENOFFICE="${LIVE_LANGUAGE}"
- fi
-
- # Setting packages
- for LOCALIZATION in ${LOCALIZATIONS}
- do
- case "${LOCALZATION}" in
- iceape)
- if [ -f chroot/usr/bin/iceape ]
- then
- PACKAGES="${PACKAGES} iceweasel-l10n-${ICEAPE}"
- fi
- ;;
-
- icedove)
- if [ -f chroot/usr/bin/icedove ]
- then
- PACKAGES="${PACKAGES} icedove-locale-${ICEDOVE}"
- fi
- ;;
-
- iceweasel)
- if [ -f chroot/usr/bin/iceweasel ]
- then
- PACKAGES="${PACKAGES} iceweasel-l10n-${ICEWEASEL}"
- fi
- ;;
-
- kde)
- if [ -f chroot/usr/bin/kstart ]
- then
- PACKAGES="${PACKAGES} kde-i18n-${KDE}"
- fi
- ;;
-
- koffice)
- if [ -f chroot/usr/bin/usr/bin/koconverter ]
- then
- PACKAGES="${PACKAGES} koffice-i18n-${KOFFICE}"
- fi
- ;;
-
- openoffice)
- if [ -f chroot/usr/bin/ooffice ]
- then
- PACKAGES="${PACKAGES} openoffice.org-l10n-${OPENOFFICE}"
- fi
- ;;
- esac
- done
-
- # Restoring cache
- Restore_cache cache/chroot_localization
-
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "apt-get install --assume-yes ${PACKAGES}"
- ;;
- esac
-
- # Saving cache
- Save_cache cache/chroot_localization
-
- # Creating stage file
- Create_stagefile .stage/chroot_localization
-fi
Copied: releases/live-helper/1.0~a7-1/helpers/lh_chroot_localization (from rev 1135, dists/trunk/live-helper/helpers/lh_chroot_localization)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_proc 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,90 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="mount /proc"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_proc: Init"
-
-# 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
-
- if [ ! -d chroot/proc ]
- then
- # Creating mountpoint
- mkdir -p chroot/proc
- fi
-
- # Mounting /proc
- 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
- umount chroot/proc/sys/fs/binfmt_misc
- fi
-
- # Unmounting /proc
- #fuser -km chroot/proc
- umount chroot/proc > /dev/null 2>&1
-
- # Removing stage file
- rm -f .stage/chroot_proc
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a7-1/helpers/lh_chroot_proc (from rev 1140, dists/trunk/live-helper/helpers/lh_chroot_proc)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_sources 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,223 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="manage /etc/apt/sources.list"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_sources: Init"
-
-# 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_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
-
- if [ "${LIVE_SECURITY}" = "enabled" ]
- then
- if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "yes" ]
- then
- echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- fi
-
- # Check local sources.list
- if ls config/chroot_sources/*.build &> /dev/null
- then
- echo "" >> chroot/etc/apt/sources.list
- echo "# Custom repositories" >> chroot/etc/apt/sources.list
-
- for FILE in config/chroot_sources/*.build
- do
- cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
- done
- fi
-
- # Check local gpg keys
- if ls config/chroot_sources/*.build.gpg &> /dev/null
- then
- for FILE in config/chroot_sources/*.build.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
- 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
-
- # 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 [ "${LH_APT_GENERIC}" = "enabled" ]
- then
- # Don't do anything if it's not required
- if [ "${LIVE_MIRROR_BUILD}" = "${LIVE_MIRROR_IMAGE}" ] && \
- [ "${LIVE_MIRROR_BUILD_SECURITY}" = "${LIVE_MIRROR_IMAGE_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_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
-
- if [ "${LIVE_SECURITY}" = "enabled" ]
- then
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ]
- then
- echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LIVE_SOURCE}" = "yes" ]
- then
- echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- fi
-
- # Check local sources.list
- if ls config/chroot_sources/*.image &> /dev/null
- then
- echo "" >> chroot/etc/apt/sources.list
- echo "# Custom repositories" >> chroot/etc/apt/sources.list
-
- for FILE in config/chroot_sources/*.image
- do
- cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
- done
- fi
-
- # Check local gpg keys
- if ls config/chroot_sources/*.image.gpg &> /dev/null
- then
- for FILE in config/chroot_sources/*.image.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~a7-1/helpers/lh_chroot_sources (from rev 1124, dists/trunk/live-helper/helpers/lh_chroot_sources)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_symlinks 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,88 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="convert symlinks"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_symlinks: Init"
-
-# 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
-
-if [ "${LIVE_SYMLINKS}" = "enabled" ]
-then
- if [ -f chroot/usr/bin/symlinks ]
- then
- SYMLINKS="true"
- fi
-
- if [ -n "${SYMLINKS}" ]
- then
- # Installing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes symlinks"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes symlinks"
- ;;
- esac
- fi
-
- # Converting symlinks
- Chroot "symlinks -c -r -s /"
-
- if [ -n "${SYMLINKS}" ]
- then
- # Removing symlinks
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes symlinks"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes symlinks"
- ;;
- esac
- fi
-
- # Creating stage file
- Create_stagefile .stage/chroot_symlinks
-fi
Copied: releases/live-helper/1.0~a7-1/helpers/lh_chroot_symlinks (from rev 1135, dists/trunk/live-helper/helpers/lh_chroot_symlinks)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_sysfs 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,84 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="mount /sys"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh_testroot
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_sysfs: Init"
-
-# 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
-
- if [ ! -d chroot/sys ]
- then
- # Create mountpoint
- mkdir -p chroot/sys
- fi
-
- # Mounting /sys
- 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
- umount chroot/sys > /dev/null 2>&1
-
- # Removing stage file
- rm -f .stage/chroot_sysfs
- ;;
-
- *)
- Usage
- ;;
-esac
Copied: releases/live-helper/1.0~a7-1/helpers/lh_chroot_sysfs (from rev 1140, dists/trunk/live-helper/helpers/lh_chroot_sysfs)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_chroot_tasks 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,116 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install tasks into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "chroot_tasks: Init"
-
-# 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}" ]
-then
- # Restoring cache
- Restore_cache cache/chroot_tasks
-
- # Select packages
- case "${LH_TASKSEL}" in
- aptitude)
- if [ ! -f chroot/usr/bin/aptitude ]
- then
- PACKAGES="${PACKAGES} aptitude"
- fi
- ;;
-
- tasksel)
- if [ ! -f chroot/usr/bin/tasksel ]
- then
- PACKAGES="${PACKAGES} tasksel"
- fi
- ;;
- esac
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- 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
-
- if [ -n "${PACKAGES}" ]
- then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Saving cache
- Save_cache cache/chroot_tasks
-
- # Creating stage file
- Create_stagefile .stage/chroot_tasks
-fi
Copied: releases/live-helper/1.0~a7-1/helpers/lh_chroot_tasks (from rev 1135, dists/trunk/live-helper/helpers/lh_chroot_tasks)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_clean 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,112 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="clean up system build directories"
-HELP=""
-USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-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)
- rm -rf cache
- ;;
-
- chroot)
- umount -f chroot/sys > /dev/null 2>&1 || true
- umount -f chroot/proc > /dev/null 2>&1 || true
- umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
- umount -f chroot/dev/shm > /dev/null 2>&1 || true
- umount -f chroot/dev/pts > /dev/null 2>&1 || true
- umount -f chroot/dev > /dev/null 2>&1 || true
-
- rm -rf chroot chroot.tmp
-
- if [ "${PURGE}" != "true" ] && [ -d cache/chroot_bootstrap ]
- then
- cp -a cache/chroot_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~a7-1/helpers/lh_clean (from rev 1148, dists/trunk/live-helper/helpers/lh_clean)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_config 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,332 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="create configuration for live-helper(7)"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-CONFIG="${1}"
-
-Echo_debug "Init ${PROGRAM}"
-
-if [ -n "${LH_CONFIG}" ]
-then
- if [ -d /usr/share/live-helper/configs/"${LH_CONFIG}" ]
- then
- mkdir "${LH_CONFIG}"
- cp -r /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 /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/image
-fi
-
-# Setting defaults
-Set_defaults
-
-Breakpoint "config: Init"
-
-# Creating configuration directory
-mkdir -p "${LIVE_ROOT}"/config
-
-# Creating live-helper configuration
-cat > "${LIVE_ROOT}"/config/common << EOF
-# config/common: configuration for live-helper(7)
-
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
-
-# \$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_GENERIC: set apt/aptitude generic indices
-# (Default: ${LH_APT_GENERIC})
-LH_APT_GENERIC="${LH_APT_GENERIC}"
-
-# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: ${LH_APT_PDIFFS})
-LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-
-# \$LH_APT_RECOMMENDS: enable recommends
-# (Default: ${LH_APT_RECOMMENDS})
-LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-
-# \$LH_APT_SECURE: enable secure
-# (Default: ${LH_APT_SECURE})
-LH_APT_SECURE="${LH_APT_SECURE}"
-
-# \$LH_BOOTSTRAP: select the bootstrap program
-# (Default: ${LH_BOOTSTRAP})
-LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-
-# \$LH_CACHE: control if downloaded packages should be cached
-# (Default: ${LH_CACHE})
-LH_CACHE="${LH_CACHE}"
-
-# \$LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
-# (Default: ${LH_DEBCONF_FRONTEND})
-LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-
-# \$LH_DEBCONF_PRIORITY: set the debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
-# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: ${LH_DEBCONF_NOWARNINGS})
-LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-
-# \$LH_GENISOIMAGE: set the genisoimage program
-# (Default: ${LH_GENISOIMAGE})
-LH_GENISOIMAGE="${LH_GENISOIMAGE}"
-
-# \$LH_LOSETUP: set the losetup program
-# (Default: autodetected)
-LH_LOSETUP="${LH_LOSETUP}"
-
-# \$LH_TASKSEL: set the tasksel program
-# (Default: ${LH_TASKSEL})
-LH_TASKSEL="${LH_TASKSEL}"
-
-# \$LIVE_ROOT: set the root directory
-# (Default: ${LIVE_ROOT})
-LIVE_ROOT="${LIVE_ROOT}"
-
-# 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_chroot_* configuration
-cat > "${LIVE_ROOT}"/config/chroot << EOF
-# config/chroot: configuration for lh_chroot_*
-
-# \$LIVE_KERNEL_FLAVOUR: set the kernel flavour to use
-# (Default: autodetected)
-LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}"
-
-# \$LIVE_KERNEL_PACKAGES: set the kernel packages to use
-# (Default: autodetected)
-LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}"
-
-# \$LIVE_KEYRING_PACKAGES: set the keyring packages
-# (Default: empty)
-LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
-
-# \$LIVE_HOOKS: set hook commands
-# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
-
-# \$LIVE_LANGUAGE: set the language to use
-# (Default: empty)
-LIVE_LANGUAGE="${LIVE_LANGUAGE}"
-
-# \$LIVE_PACKAGES: set the packages to install
-# (Default: empty)
-LIVE_PACKAGES="${LIVE_PACKAGES}"
-
-# \$LIVE_PACKAGES_LISTS: set the package list to install
-# (Default: ${LIVE_PACKAGES_LISTS})
-LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
-
-# \$LIVE_TASKS: set the 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}"
-
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
-EOF
-
-# Creating lh_chroot_* directories
-mkdir -p "${LIVE_ROOT}"/config/chroot_localhooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_localincludes
-mkdir -p "${LIVE_ROOT}"/config/chroot_localpackages
-mkdir -p "${LIVE_ROOT}"/config/chroot_localpackageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
-
-# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
-# config/bootstrap: configuration for lh_bootstrap_*
-
-# \$LIVE_ARCHITECTURE: select the chroot architecture
-# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
-
-# \$LIVE_DISTRIBUTION: select the distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory
-# (Default: empty)
-LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
-
-# \$LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-
-# \$LIVE_MIRROR_BUILD: set the mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BUILD})
-LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}"
-
-# \$LIVE_MIRROR_BUILD_SECURITY: set the security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BUILD_SECURITY})
-LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}"
-
-# \$LIVE_MIRROR_IMAGE: set the mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_IMAGE})
-LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}"
-
-# \$LIVE_MIRROR_IMAGE_SECURITY: set the security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_IMAGE_SECURITY})
-LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}"
-
-# \$LIVE_SECTIONS: select the section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
-EOF
-
-# Creating lh_image_* configuration
-cat > "${LIVE_ROOT}"/config/image << EOF
-# config/chroot: configuration for lh_image_*
-
-# \$LIVE_BOOTAPPEND: set boot parameters
-# (Default: empty)
-LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
-
-# \$LIVE_ENCRYPTION: set encrytion
-# (Default: empty)
-LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
-
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
-
-# \$LIVE_HOSTNAME: set hostname
-# (Default: ${LIVE_HOSTNAME})
-LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-
-# \$LIVE_FILESYSTEM: set filesystem
-# (Default: ${LIVE_FILESYSTEM})
-LIVE_FILESYSTEM="${LIVE_FILESYSTEM}"
-
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
-
-# \$LIVE_ISO_VOLUME: set iso volume
-# (Default: ${LIVE_ISO_VOLUME})
-LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-
-# \$LIVE_SERVER_ADDRESS: set the netboot server address
-# (Default: ${LIVE_SERVER_ADDRESS})
-LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}"
-
-# \$LIVE_SERVER_PATH: set the netboot server directory
-# (Default: ${LIVE_SERVER_PATH})
-LIVE_SERVER_PATH="${LIVE_SERVER_PATH}"
-
-# \$LIVE_SOURCE: set source option
-# (Default: ${LH_SOURCE})
-LIVE_SOURCE="${LIVE_SOURCE}"
-
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
-
-# \$LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
-
-# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-
-# \$LIVE_BINARY_IMAGE: set image type
-# (Default: ${LIVE_BINARY_IMAGE})
-LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}"
-
-# \$LIVE_SOURCE_IMAGE: set image type
-# (Default: ${LIVE_SOURCE_IMAGE})
-LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}"
-
-# \$LIVE_INCLUDES: set includes
-# (Default: ${LIVE_INCLUDES})
-LIVE_INCLUDES="${LIVE_INCLUDES}"
-
-# \$LIVE_TEMPLATES: set templates
-# (Default: ${LIVE_TEMPLATES})
-LIVE_TEMPLATES="${LIVE_TEMPLATES}"
-EOF
-
-# Creating lh_binary_* directories
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_localincludes
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
Copied: releases/live-helper/1.0~a7-1/helpers/lh_config (from rev 1144, dists/trunk/live-helper/helpers/lh_config)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_losetup 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,62 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="wrapper around losetup"
-HELP=""
-USAGE="${PROGRAM} <device> <file> <partition>"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "losetup: Init"
-
-if [ -z "${1}" ]
-then
- DEVICE="`${LH_LOSETUP} -f`"
-else
- DEVICE="${1}"
-fi
-
-FILE="${2}"
-PARTITION="${3}"
-
-${LH_LOSETUP} "${DEVICE}" "${FILE}"
-FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
-${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_LOSETUP} "${DEVICE}" "${FILE}"
-else
- ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
-fi
Copied: releases/live-helper/1.0~a7-1/helpers/lh_losetup (from rev 1140, dists/trunk/live-helper/helpers/lh_losetup)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_source_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_source_usb 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-# lh_source_usb(1) - build 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="build source image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "source_usb: Init"
-
-if [ "${LIVE_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-for IMAGE in ${LIVE_SOURCE_IMAGE}
-do
- if [ "${IMAGE}" = "usb" ]
- then
- # Requiring stage file
- Require_stagefile .stage/source_download
-
- # Checking stage file
- Check_stagefile .stage/source_usb
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- if [ ! -f chroot/sbin/mkdosfs ]
- then
- PACKAGES="${PACKAGES} dosfstools"
- fi
-
- if [ ! -f chroot/sbin/parted ]
- then
- PACKAGES="${PACKAGES} parted"
- fi
-
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # 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} / 20`" # Just 5% 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.msdos -n DEBIAN_LIVE ${FREELO}"
- mkdir -p source.tmp
- mount ${FREELO} source.tmp
- cp -r source/* source.tmp
- 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
-
- if [ -n "${PACKAGES}" ]
- then
- # Removing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
-
- # Creating stage file
- Create_stagefile .stage/source_usb
- fi
-done
Copied: releases/live-helper/1.0~a7-1/helpers/lh_source_usb (from rev 1140, dists/trunk/live-helper/helpers/lh_source_usb)
Deleted: releases/live-helper/1.0~a7-1/helpers/lh_testroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_testroot 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/lh_testroot 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,32 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="ensure that a system is built as root"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Checking user account
-if [ "`id -u`" -ne "0" ]
-then
- Echo_error "need root privileges"
- exit 1
-fi
Copied: releases/live-helper/1.0~a7-1/helpers/lh_testroot (from rev 1145, dists/trunk/live-helper/helpers/lh_testroot)
Deleted: releases/live-helper/1.0~a7-1/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/helpers/make-live 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,386 +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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-PROGRAM="`basename ${0}`"
-DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-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 KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose]"
-
-HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
-
-Local_arguments ()
-{
- ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
- if [ "${?}" != "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
- ;;
-
- --apt-generic)
- LH_APT_GENERIC="${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
- ;;
-
- # 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-build)
- LIVE_MIRROR_BUILD="${2}"; shift 2
- ;;
-
- --mirror-build-security)
- LIVE_MIRROR_BUILD_SECURITY="${2}"; shift 2
- ;;
-
- --mirror-image)
- LIVE_MIRROR_IMAGE="${2}"; shift 2
- ;;
-
- --mirror-image-security)
- LIVE_MIRROR_IMAGE_SECURITY="${2}"; shift 2
- ;;
-
- --sections)
- LIVE_SECTIONS="${2}"; shift 2
- ;;
-
- # chroot
- --interactive)
- LIVE_INTERACTIVE="${2}"; shift 2
- ;;
-
- -k|--kernel-flavour)
- LIVE_KERNEL_FLAVOUR="${2}"; shift 2
- ;;
-
- --kernel-packages)
- LIVE_KERNEL_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
- ;;
-
- --filesystem)
- LIVE_FILESYSTEM="${2}"; shift 2
- ;;
-
- --memtest)
- LIVE_MEMTEST="${2}"; shift 2
- ;;
-
- --iso-volume)
- LIVE_ISO_VOLUME="${2}"; shift 2
- ;;
-
- --server-address)
- LIVE_SERVER_ADDRESS="${2}"; shift 2
- ;;
-
- --server-path)
- LIVE_SERVER_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-image)
- LIVE_BINARY_IMAGE="${2}"; shift 2
- ;;
-
- -s|--source-image)
- LIVE_SOURCE_IMAGE="${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
-
- if [ -z "${ROOT}" ]
- then
- ROOT="${LIVE_ROOT}"
- fi
-
- # 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_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_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_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" 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
-}
-
-Main "${@}"
Copied: releases/live-helper/1.0~a7-1/helpers/make-live (from rev 1149, dists/trunk/live-helper/helpers/make-live)
Deleted: releases/live-helper/1.0~a7-1/includes/sid
===================================================================
--- dists/trunk/live-helper/includes/sid 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/includes/sid 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1 +0,0 @@
-link etch/
\ No newline at end of file
Copied: releases/live-helper/1.0~a7-1/includes/sid (from rev 1113, dists/trunk/live-helper/includes/sid)
Deleted: releases/live-helper/1.0~a7-1/templates/syslinux/isolinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/isolinux.cfg 2007-04-19 14:09:30 UTC (rev 1103)
+++ releases/live-helper/1.0~a7-1/templates/syslinux/isolinux.cfg 2007-04-24 07:56:37 UTC (rev 1152)
@@ -1,13 +0,0 @@
-default live
-LIVE_KERNEL_LIVE
-LIVE_KERNEL_INSTALL
-LIVE_MEMTEST
-display isolinux.txt
-timeout 0
-prompt 1
-f1 f1.txt
-f3 f3.txt
-f4 f4.txt
-f8 f8.txt
-f9 f9.txt
-f0 f10.txt
Copied: releases/live-helper/1.0~a7-1/templates/syslinux/isolinux.cfg (from rev 1111, dists/trunk/live-helper/templates/syslinux/isolinux.cfg)
More information about the Debian-live-changes
mailing list