diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:11 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:30 +0100 |
| commit | 37a5c53ddd2825bf6b0ce521908a63d419683981 (patch) | |
| tree | 0b0a8ea3072a4d6b9c37ce8efedb29d25a713e04 | |
| parent | 85c342c299231131d22764c0dfdcf977c57ce147 (diff) | |
| download | vyos-live-build-37a5c53ddd2825bf6b0ce521908a63d419683981.tar.gz vyos-live-build-37a5c53ddd2825bf6b0ce521908a63d419683981.zip | |
Adding live-helper 1.0~a14-1.
53 files changed, 346 insertions, 273 deletions
diff --git a/debian/changelog b/debian/changelog index 5fa0375d6..087f2ab00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +live-helper (1.0~a14-1) unstable; urgency=medium + + * New upstream release: + - fixes typo in manpage (Closes: #428192). + + -- Daniel Baumann <daniel@debian.org> Mon, 11 Jun 2007 00:00:00 +0200 + live-helper (1.0~a13-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index c1e288dad..c54441f0b 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/ Package: live-helper Architecture: all Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2) -Conflicts: live-package (<< 1.0) +Conflicts: live-package (<< 1.0~a13) Replaces: live-package Provides: make-live Description: Debian Live helper programs diff --git a/docs/ChangeLog b/docs/ChangeLog index 4901025ec..fe894c312 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,27 @@ +2007-06-10 Daniel Baumann <daniel@debian.org> + + * helpers/lh_binary_grub, lh_binary_rootfs, lh_binary_yaboot, + lh_binary_syslinux: + - Fixed some typos as found by Peter Holik <holik@it-technology.at>. + * manpages/live-helper.en.7: + - Fixed typo. + * helpers/lh_bootstrap_cache, lh_chroot_cache: + - Added. + * Uploaded 1.0~a14-1. + +2007-06-08 Daniel Baumann <daniel@debian.org> + + * helpers/make-live: + - Adjusted reading of configuration to match the previously renamed + files. + +2007-06-04 Daniel Baumann <daniel@debian.org> + + * helpers/lh_binary_hdd, lh_source_hdd: + - Renamed to lh_binary_tar and lh_source_tar. + * helpers/lh_source_generic: + - Removed. + 2007-06-03 Daniel Baumann <daniel@debian.org> * Uploaded 1.0~a13-1. diff --git a/examples/cron/crontab b/examples/cron/crontab index 2d6b052d7..470be6ee4 100644 --- a/examples/cron/crontab +++ b/examples/cron/crontab @@ -4,5 +4,4 @@ SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # m h dom mon dow user command -*/1 * * * * root /etc/cron.d/live-webhelper > /dev/null 2>&1 */10 * * * * user /usr/share/doc/live-helper/examples/cron/snapshots.sh > /dev/null 2>&1 diff --git a/examples/cron/daily.sh b/examples/cron/daily.sh index f2b5c09fa..30c136502 100755 --- a/examples/cron/daily.sh +++ b/examples/cron/daily.sh @@ -70,12 +70,12 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi - if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar.gz ] then # Creating log directory mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log @@ -90,7 +90,7 @@ do # Moving images mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + mv "${TEMPDIR}"/debian-live/source.tar.gz "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar.gz fi if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] @@ -110,7 +110,7 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh index 66ed123b5..20445cd87 100755 --- a/examples/cron/etch+beryl.sh +++ b/examples/cron/etch+beryl.sh @@ -7,7 +7,7 @@ BUILD="etch+beryl" # Begin custom defaults AUTOBUILD="enabled" -DATE="r0_1.0~a13-1" +DATE="r0_1.0~a14-1" DESTDIR="/srv/debian-unofficial/ftp/debian-live" TEMPDIR="/srv/tmp/live-helper" @@ -79,12 +79,12 @@ do cp /usr/share/live-helper/examples/sources/beryl debian-live/config/chroot_sources/beryl.image # Generating images - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi - if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar.gz ] then # Creating log directory mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log @@ -99,7 +99,7 @@ do # Moving images mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso - mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar + mv "${TEMPDIR}"/debian-live/source.tar.gz "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar.gz fi if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] @@ -119,7 +119,7 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh index e4cbb55fc..4b9c26d79 100755 --- a/examples/cron/etch.sh +++ b/examples/cron/etch.sh @@ -7,7 +7,7 @@ BUILD="etch" # Begin custom defaults AUTOBUILD="enabled" -DATE="r0_1.0~a13-1" +DATE="r0_1.0~a14-1" DESTDIR="/srv/debian-unofficial/ftp/debian-live" TEMPDIR="/srv/tmp/live-helper" @@ -70,12 +70,12 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi - if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar.gz ] then # Creating log directory mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log @@ -90,7 +90,7 @@ do # Moving images mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + mv "${TEMPDIR}"/debian-live/source.tar.gz "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar.gz fi if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] @@ -110,7 +110,7 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi diff --git a/examples/cron/weekly.sh b/examples/cron/weekly.sh index 19c1054aa..54aa092d7 100755 --- a/examples/cron/weekly.sh +++ b/examples/cron/weekly.sh @@ -70,12 +70,12 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi - if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar.gz ] then # Creating log directory mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log @@ -90,7 +90,7 @@ do # Moving images mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + mv "${TEMPDIR}"/debian-live/source.tar.gz "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar.gz fi if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] @@ -110,7 +110,7 @@ do echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt # Generating images - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt fi diff --git a/functions/common.sh b/functions/common.sh index 19e256641..5c25e29b0 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a13" +VERSION="1.0~a14" diff --git a/functions/defaults.sh b/functions/defaults.sh index 3c80b9064..8179ec3e9 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -171,11 +171,17 @@ Set_defaults () fi fi - # If we are root, disable root command if [ "`id -u`" = "0" ] then - # FIXME: this is disabled until considered safe + # If we are root, disable root command LIVE_ROOT_COMMAND="" + else + if [ -x /usr/bin/sudo ] + then + # FIXME: this is disabled until considered safe + #LIVE_ROOT_COMMAND="sudo" + LIVE_ROOT_COMMAND="" + fi fi # Setting tasksel @@ -425,6 +431,9 @@ Set_defaults () # Setting packages list string LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}" + # Setting package preseed + # LIVE_PRESEED + # Setting tasks string for LIST in ${LIVE_PACKAGES_LISTS} do @@ -579,5 +588,5 @@ Set_defaults () LIVE_SOURCE="${LIVE_SOURCE:-disabled}" # Setting image type - LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-generic}" + LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-tar}" } diff --git a/helpers/lh_binary b/helpers/lh_binary index 0ebb1d7f6..e710b339f 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -51,9 +51,9 @@ lh_binary_local-includes ${*} lh_binary_md5sum ${*} # Building images -lh_binary_hdd ${*} lh_binary_iso ${*} lh_binary_net ${*} +lh_binary_tar ${*} lh_binary_usb-hdd ${*} # Deconfiguring chroot diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 99227c06f..d04ec3125 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -66,7 +66,7 @@ case "${LIVE_BINARY_IMAGES}" in exit 1 ;; - usb-hdd|hdd) + tar|usb-hdd) # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then @@ -112,7 +112,7 @@ mkdir -p "${DESTDIR}" # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then - if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ] + if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] then if [ "${LIVE_BOOTLOADER}" = "syslinux" ] then @@ -137,7 +137,7 @@ then # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then - if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ] + if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] then if [ "${LIVE_BOOTLOADER}" = "syslinux" ] then diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index 9300642d7..db26ae988 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -93,7 +93,7 @@ esac # Setting destination directory case "${LIVE_BINARY_IMAGES}" in - iso|usb-hdd|hdd) + iso|tar|usb-hdd) DESTDIR_LIVE="binary/live" DESTDIR_INSTALL="binary/install" ;; @@ -151,7 +151,7 @@ fi if [ -n "${LIVE_HOSTNAME}" ] then - case "${LIVE_INITRAMFS}" in + case "${LH_INITRAMFS}" in casper) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" ;; @@ -245,7 +245,7 @@ case ${LIVE_BINARY_IMAGES} in cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub ;; - usb-hdd|hdd) + tar|usb-hdd) cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub ;; esac diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index 474cf785f..306590d51 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -59,7 +59,7 @@ case "${LIVE_BINARY_IMAGES}" in DESTDIR="tftpboot" ;; - usb-hdd|hdd) + tar|usb-hdd) # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index 85f93e22e..0ab2c4ee4 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -81,7 +81,7 @@ case "${LIVE_BINARY_IMAGES}" in DESTDIR="tftpboot" ;; - usb-hdd|hdd) + tar|usb-hdd) # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 359151f7d..455b1ab91 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -74,7 +74,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in rm -f binary/${INITFS}/filesystem.ext2 fi - DU_DIM="`du -ks chroot | cut -f1`" + DU_DIM="`du -ks chroot/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" diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 869bcc1f4..977796d2e 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -103,7 +103,7 @@ case "${LIVE_BINARY_IMAGES}" in DESTDIR_INSTALL="tftpboot" ;; - usb-hdd|hdd) + tar|usb-hdd) # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then @@ -163,7 +163,7 @@ fi if [ -n "${LIVE_HOSTNAME}" ] then - case "${LIVE_INITRAMFS}" in + case "${LH_INITRAMFS}" in casper) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" ;; @@ -238,7 +238,7 @@ then # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then - if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ] + if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] then VMLINUZ_DI="vmlinuz.di" INITRD_DI="initrddi.gz" @@ -449,7 +449,7 @@ case "${LIVE_BINARY_IMAGES}" in fi ;; - usb-hdd|hdd) + tar|usb-hdd) # Workaround for syslinux (<< 3.36) which doesn't support dedicated directory if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ] then diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_tar index 40762e828..e3ef16758 100755 --- a/helpers/lh_binary_hdd +++ b/helpers/lh_binary_tar @@ -1,6 +1,6 @@ #!/bin/sh -# lh_binary_hdd(1) - build harddisk binary image +# lh_binary_tar(1) - build harddisk binary image # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd +if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs tar then exit 0 fi @@ -43,7 +43,7 @@ Echo_message "Begin building binary harddisk image..." Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/binary_hdd +Check_stagefile .stage/binary_tar # Checking lock file Check_lockfile .lock @@ -52,9 +52,9 @@ Check_lockfile .lock Create_lockfile .lock # Remove old binary -rm -f binary-hdd.tar.gz +rm -f binary.tar.gz -tar cfz binary-hdd.tar.gz binary +tar cfz binary-tar.tar.gz binary # Creating stage file -Create_stagefile .stage/binary_hdd +Create_stagefile .stage/binary_tar diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index 0b0becf40..d368692ba 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -97,7 +97,7 @@ case "${LIVE_BINARY_IMAGES}" in DESTDIR="binary/live" ;; - net|usb-hdd|hdd) + net|tar|usb-hdd) Echo_error "not supported, FIXME" ;; esac @@ -139,7 +139,7 @@ fi if [ -n "${LIVE_HOSTNAME}" ] then - case "${LIVE_INITRAMFS}" in + case "${LH_INITRAMFS}" in casper) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" ;; diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index fbb8f17e8..5e483aea9 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -33,5 +33,7 @@ Read_conffile config/source Set_defaults # Bootstrapping system +lh_bootstrap_cache restore ${*} lh_bootstrap_cdebootstrap ${*} lh_bootstrap_debootstrap ${*} +lh_bootstrap_cache save ${*} diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache new file mode 100755 index 000000000..6d79e09da --- /dev/null +++ b/helpers/lh_bootstrap_cache @@ -0,0 +1,92 @@ +#!/bin/sh + +# lh_bootstrap_cache(1) - cach bootstrap stage +# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="cache bootstrap stage" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Echo_message "Begin caching bootstrap stage..." + +for STAGE in ${LH_CACHE_STAGES} +do + case "${1}" in + restore) + # Checking stage file + Check_stagefile .stage/bootstrap_cache.restore + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] + then + # Restoring old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot + fi + + # Creating stage file + Create_stagefile .stage/bootstrap_cache.restore + + exit 0 + fi + ;; + + save) + # Checking stage file + Check_stagefile .stage/bootstrap_cache.save + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "bootstrap" ] + then + rm -rf cache/stages_bootstrap + + mkdir -p cache + + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap + fi + fi + ;; + esac +done diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 2eaa23fe9..60ecade2b 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -44,6 +44,7 @@ lh_testroot # Checking stage file Check_stagefile .stage/bootstrap +Check_stagefile .stage/bootstrap_cache.restore # Checking lock file Check_lockfile .lock @@ -94,25 +95,6 @@ fi if [ -x "/usr/bin/cdebootstrap" ] then - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] - then - # Restore old cache - ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot - fi - - # Creating stage file - Create_stagefile .stage/bootstrap - - exit 0 - fi - done - if [ "${LH_CACHE_PACKAGES}" = "enabled" ] then if [ -d cache/packages_bootstrap ] @@ -163,27 +145,6 @@ then # Removing bootstrap cache rm -rf chroot/var/cache/bootstrap - # Saving new cache - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] - then - if [ -d cache/stages_bootstrap ] - then - rm -rf cache/stages_bootstrap - fi - - mkdir -p cache - - ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap - fi - fi - done - # Creating stage file Create_stagefile .stage/bootstrap else diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 58d36c4d7..b4307a1ad 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -44,6 +44,7 @@ lh_testroot # Checking stage file Check_stagefile .stage/bootstrap +Check_stagefile .stage/bootstrap_cache.restore # Checking lock file Check_lockfile .lock @@ -72,25 +73,6 @@ fi if [ -x "/usr/sbin/debootstrap" ] then - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] - then - # Restore old cache - ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot - fi - - # Creating stage file - Create_stagefile .stage/bootstrap - - exit 0 - fi - done - if [ "${LH_CACHE_PACKAGES}" = "enabled" ] then if [ -d cache/packages_bootstrap ] @@ -130,27 +112,6 @@ then # Removing bootstrap cache rm -f chroot/var/cache/apt/archives/*.deb - # Saving new cache - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] - then - if [ -d cache/stages_bootstrap ] - then - rm -rf cache/stages_bootstrap - fi - - mkdir -p cache - - ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap - fi - fi - done - # Creating stage file Create_stagefile .stage/bootstrap else diff --git a/helpers/lh_chroot b/helpers/lh_chroot index b12521ff6..94e60e1a1 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -33,6 +33,7 @@ Read_conffile config/source Set_defaults # Configuring chroot +lh_chroot_cache restore ${*} lh_chroot_proc install ${*} lh_chroot_sysfs install ${*} lh_chroot_debianchroot install ${*} @@ -69,3 +70,4 @@ lh_chroot_sysvrc remove ${*} lh_chroot_debianchroot remove ${*} lh_chroot_sysfs remove ${*} lh_chroot_proc remove ${*} +lh_chroot_cache save ${*} diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache new file mode 100755 index 000000000..8d3d9620b --- /dev/null +++ b/helpers/lh_chroot_cache @@ -0,0 +1,92 @@ +#!/bin/sh + +# lh_chroot_cache(1) - cach chroot stage +# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="cache chroot stage" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Echo_message "Begin caching chroot stage..." + +for STAGE in ${LH_CACHE_STAGES} +do + case "${1}" in + restore) + # Checking stage file + Check_stagefile .stage/chroot_cache.restore + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "chroot" ] && [ -d cache/stages_chroot ] + then + # Restoring old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_chroot/* chroot + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot + fi + + # Creating stage file + Create_stagefile .stage/chroot_cache.restore + + exit 0 + fi + ;; + + save) + # Checking stage file + Check_stagefile .stage/chroot_cache.save + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "chroot" ] + then + rm -rf cache/stages_chroot + + mkdir -p cache + + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_chroot + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_chroot + fi + fi + ;; + esac +done diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed index 88f9dd3f5..02418c780 100755 --- a/helpers/lh_chroot_preseed +++ b/helpers/lh_chroot_preseed @@ -32,6 +32,11 @@ Read_conffile config/binary Read_conffile config/source Set_defaults +if [ -z "${LIVE_PRESEED}" ] +then + exit 0 +fi + Echo_message "Begin executing preseed..." # Requiring stage file @@ -46,30 +51,27 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ -n "${LIVE_PRESEED}" ] +if [ -f "${LIVE_PRESEED}" ] then - if [ -f "${LIVE_PRESEED}" ] - then - # Check dependency - Check_package chroot/usr/bin/debconf-set-selections debconf + # Check dependency + Check_package chroot/usr/bin/debconf-set-selections debconf - # Install dependency - Install_package + # Install dependency + Install_package - # Copying preseed - cp "${LIVE_PRESEED}" chroot/root/preseed + # Copying preseed + cp "${LIVE_PRESEED}" chroot/root/preseed - Chroot "debconf-set-selections /root/preseed" + Chroot "debconf-set-selections /root/preseed" - # Removing preseed file - rm -f chroot/root/preseed + # Removing preseed file + rm -f chroot/root/preseed - # Remove dependency - Remove_package + # Remove dependency + Remove_package - # Creating stage file - Create_stagefile .stage/chroot_preseed - fi + # Creating stage file + Create_stagefile .stage/chroot_preseed else Echo_error "'${LIVE_PRESEED}' file doesn't exists." exit 1 diff --git a/helpers/lh_config b/helpers/lh_config index b911207d1..551e5b127 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -268,6 +268,10 @@ LIVE_PACKAGES="${LIVE_PACKAGES}" # (Default: ${LIVE_PACKAGES_LISTS}) LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" +# \$LIVE_PRESEED: set package preseed +# (Default: ${LIVE_PRESEED}) +LIVE_PRESEED="${LIVE_PRESEED}" + # \$LIVE_TASKS: set tasks to install # (Default: empty) LIVE_TASKS="${LIVE_TASKS}" diff --git a/helpers/lh_source b/helpers/lh_source index bf077726e..40453cdc4 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -43,10 +43,9 @@ lh_source_debian ${*} lh_source_md5sum ${*} # Building images -lh_source_generic ${*} -lh_source_hdd ${*} lh_source_iso ${*} lh_source_net ${*} +lh_source_tar ${*} lh_source_usb-hdd ${*} # Deconfiguring chroot diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd deleted file mode 100755 index 416f1ba59..000000000 --- a/helpers/lh_source_hdd +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# lh_source_hdd(1) - build source harddisk image -# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done - -# Setting static variables -DESCRIPTION="build source harddisk image" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -if [ "${LIVE_SOURCE}" != "enabled" ] -then - exit 0 -fi - -if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd -then - exit 0 -fi - -Echo_message "Begin building source harddisk image..." -Echo_message "This may take a while." - -# Requiring stage file -Require_stagefile .stage/source_debian - -# Checking stage file -Check_stagefile .stage/source_hdd - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Remove old source -if [ -f source-hdd.tar.gz ] -then - rm -f source-hdd.tar.gz -fi - -# Create tarball -tar cfz source-hdd.tar.gz source - -# Creating stage file -Create_stagefile .stage/source_hdd diff --git a/helpers/lh_source_generic b/helpers/lh_source_tar index 7c1b82626..51170a33e 100755 --- a/helpers/lh_source_generic +++ b/helpers/lh_source_tar @@ -1,6 +1,6 @@ #!/bin/sh -# lh_source_generic(1) - build source generic image +# lh_source_tar(1) - build source tarball # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -18,7 +18,7 @@ do done # Setting static variables -DESCRIPTION="build source generic image" +DESCRIPTION="build source tarball" HELP="" USAGE="${PROGRAM} [--force]" @@ -37,19 +37,19 @@ then exit 0 fi -if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic +if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs tar then exit 0 fi -Echo_message "Begin building source generic image..." +Echo_message "Begin building source tarball..." Echo_message "This may take a while." # Requiring stage file Require_stagefile .stage/source_debian # Checking stage file -Check_stagefile .stage/source_generic +Check_stagefile .stage/source_tar # Checking lock file Check_lockfile .lock @@ -58,13 +58,13 @@ Check_lockfile .lock Create_lockfile .lock # Remove old source -if [ -f source.tar ] +if [ -f source.tar.gz ] then - rm -f source.tar + rm -f source.tar.gz fi # Create tarball -tar cf source.tar source +tar cfz source.tar.gz source # Creating stage file -Create_stagefile .stage/source_generic +Create_stagefile .stage/source_tar diff --git a/helpers/make-live b/helpers/make-live index 3f71f5cf1..6681058bf 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -33,7 +33,7 @@ done # Setting static variables PROGRAM="`basename ${0}`" DESCRIPTION="utility to build Debian Live systems" -USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" +USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior" @@ -363,7 +363,8 @@ Main () Read_conffile "${ROOT}"/config/common Read_conffile "${ROOT}"/config/bootstrap Read_conffile "${ROOT}"/config/chroot - Read_conffile "${ROOT}"/config/image + Read_conffile "${ROOT}"/config/binary + Read_conffile "${ROOT}"/config/source Local_arguments "${@}" diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1 index 52f8ae944..cce37c2c7 100644 --- a/manpages/lh_binary.de.1 +++ b/manpages/lh_binary.de.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_BINARY 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* @@ -19,7 +19,7 @@ kopiert debian\-installer in das Binary\-Image. verschl\[:u]sselt das Root\-Dateisystem. .IP "\fIlh_binary_grub\fR(1)" 4 kopiert grub in das Binary\-Image. -.IP "\fIlh_binary_hdd\fR(1)" 4 +.IP "\fIlh_binary_tar\fR(1)" 4 erstellt den Festplatten Binary\-Tarball. .IP "\fIlh_binary_includes\fR(1)" 4 kopiert Dateien in das Binary\-Image. diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1 index 660156ac6..eff49013f 100644 --- a/manpages/lh_binary.en.1 +++ b/manpages/lh_binary.en.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_BINARY 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* @@ -19,7 +19,7 @@ copies debian-installer into the binary image. encrypts the root filesystem. .IP "\fIlh_binary_grub\fR(1)" 4 copies grub into the binary image. -.IP "\fIlh_binary_hdd\fR(1)" 4 +.IP "\fIlh_binary_tar\fR(1)" 4 creates the harddisk binary tarball. .IP "\fIlh_binary_includes\fR(1)" 4 copies files into the binary image. diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1 index 5ddeb2ad3..41dd1b8a5 100644 --- a/manpages/lh_bootstrap.de.1 +++ b/manpages/lh_bootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_BOOTSTRAP 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1 index f55ceb5d6..4fa072249 100644 --- a/manpages/lh_bootstrap.en.1 +++ b/manpages/lh_bootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_bootstrap \- meta\-helper for lh_bootstrap_* diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1 index e813e3768..773d17ebe 100644 --- a/manpages/lh_bootstrap_cdebootstrap.de.1 +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1 index 6bcb0d972..4efaa983c 100644 --- a/manpages/lh_bootstrap_cdebootstrap.en.1 +++ b/manpages/lh_bootstrap_cdebootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1 index c3764c660..3466de2fe 100644 --- a/manpages/lh_bootstrap_debootstrap.de.1 +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1 index 9731e8e64..b2ba5cd94 100644 --- a/manpages/lh_bootstrap_debootstrap.en.1 +++ b/manpages/lh_bootstrap_debootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1 index 02240df11..ac6f4b9bf 100644 --- a/manpages/lh_build.de.1 +++ b/manpages/lh_build.de.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_BUILD 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1 index b88e0e07a..d34ecfff1 100644 --- a/manpages/lh_build.en.1 +++ b/manpages/lh_build.en.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_BUILD 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_build \- building a live system diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1 index c5d3dae3b..32fdd18d4 100644 --- a/manpages/lh_chroot.de.1 +++ b/manpages/lh_chroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_CHROOT 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1 index f5eb11dbf..06ea3a8f9 100644 --- a/manpages/lh_chroot.en.1 +++ b/manpages/lh_chroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_CHROOT 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_chroot \- meta\-helper for lh_chroot_* diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1 index 220615ef4..3efebcacf 100644 --- a/manpages/lh_clean.de.1 +++ b/manpages/lh_clean.de.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_CLEAN 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_clean \- r\[:a]umt das Build-Verzeichnis auf diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1 index fca8c56f2..11e009737 100644 --- a/manpages/lh_clean.en.1 +++ b/manpages/lh_clean.en.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_CLEAN 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_clean \- clean up system build directories diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1 index 167c727f8..411029ae3 100644 --- a/manpages/lh_source.de.1 +++ b/manpages/lh_source.de.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_SOURCE 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* @@ -15,16 +15,14 @@ Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Komman kopiert debian\-live Konfiguration in source. .IP "\fIlh_source_debian\fR(1)" 4 l\[:a]dt Paketquellen herunter. -.IP "\fIlh_source_generic\fR(1)" 4 -erstellt den generischen Source-Tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -erstellt den Harddisk Source-Tarball. .IP "\fIlh_source_iso\fR(1)" 4 erstellt CD/DVD Source-Image. .IP "\fIlh_source_md5sum\fR(1)" 4 erstellt md5sum.txt im Source-Image. .IP "\fIlh_source_net\fR(1)" 4 erstellt Netboot Source-Tarball. +.IP "\fIlh_source_tar\fR(1)" 4 +erstellt ein generischen Source-Tarball. .IP "\fIlh_source_usb-hdd\fR(1)" 4 erstellt USB-hdd Source-Tarball. diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1 index 6f9ef8d32..09635b633 100644 --- a/manpages/lh_source.en.1 +++ b/manpages/lh_source.en.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_SOURCE 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* @@ -15,16 +15,14 @@ Here is the complete list of available source helper commands. See their man pag copies debian\-live config into source. .IP "\fIlh_source_debian\fR(1)" 4 downloads sources. -.IP "\fIlh_source_generic\fR(1)" 4 -creates the generic source tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -creates the harddisk source tarball. .IP "\fIlh_source_iso\fR(1)" 4 creates the CD/DVD source image. .IP "\fIlh_source_md5sum\fR(1)" 4 creates md5sum.txt in the source image. .IP "\fIlh_source_net\fR(1)" 4 creates the netboot source tarball. +.IP "\fIlh_source_tar\fR(1)" 4 +creates a generic binary tarball. .IP "\fIlh_source_usb-hdd\fR(1)" 4 creates the USB-hdd source image. diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1 index 42770e516..cadf09454 100644 --- a/manpages/lh_testroot.de.1 +++ b/manpages/lh_testroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH LH_TESTROOT 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME lh_testroot \- stellt sicher dass das System als root gebaut wird diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1 index c618860bb..5df25b396 100644 --- a/manpages/lh_testroot.en.1 +++ b/manpages/lh_testroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LH_TESTROOT 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME lh_testroot \- ensure that a system is built as root diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7 index 67b9ae8b0..f30338e12 100644 --- a/manpages/live-helper.de.7 +++ b/manpages/live-helper.de.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "04.06.2007" "1.0~a13" "live\-helper" +.TH LIVE\-HELPER 7 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme @@ -35,7 +35,7 @@ kopiert debian-\installer in das Binary\-Image. verschl\[:u]sselt das Root\-Dateisystem. .IP "\fIlh_binary_grub\fR(1)" 4 kopiert grub in das Binary\-Image. -.IP "\fIlh_binary_hdd\fR(1)" 4 +.IP "\fIlh_binary_tar\fR(1)" 4 erstellt den Festplatten Binary\-Tarball. .IP "\fIlh_binary_includes\fR(1)" 4 kopiert Dateien in das Binary\-Image. @@ -127,10 +127,6 @@ Meta\-Helper f\[:u]r lh_source_* kopiert debian\-live Konfiguration in source. .IP "\fIlh_source_debian\fR(1)" 4 l\[:a]dt Paketquellen herunter. -.IP "\fIlh_source_generic\fR(1)" 4 -erstellt den generischen Source-Tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -erstellt den Harddisk Source-Tarball. .IP "\fIlh_source_iso\fR(1)" 4 erstellt CD/DVD Source-Image. .IP "\fIlh_source_md5sum\fR(1)" 4 diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7 index 641c9eee8..db3af461e 100644 --- a/manpages/live-helper.en.7 +++ b/manpages/live-helper.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs @@ -35,7 +35,7 @@ copies debian-installer into the binary image. encrypts the root filesystem. .IP "\fIlh_binary_grub\fR(1)" 4 copies grub into the binary image. -.IP "\fIlh_binary_hdd\fR(1)" 4 +.IP "\fIlh_binary_tar\fR(1)" 4 creates the harddisk binary tarball. .IP "\fIlh_binary_includes\fR(1)" 4 copies files into the binary image. @@ -102,7 +102,7 @@ installs packages lists in the chroot. .IP "\fIlh_chroot_proc\fR(1)" 4 mounts /proc in the chroot. .IP "\fIlh_chroot_resolv\fR(1)" 4 -configures /etc/resolf.conf in the chroot. +configures /etc/resolv.conf in the chroot. .IP "\fIlh_chroot_sources\fR(1)" 4 configures /etc/apt/sources.list in the chroot. .IP "\fIlh_chroot_symlinks\fR(1)" 4 @@ -127,10 +127,6 @@ meta\-helper for lh_source_*. copies config into source directory. .IP "\fIlh_source_debian\fR(1)" 4 downloads source packages. -.IP "\fIlh_source_generic\fR(1)" 4 -creates generic source tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -creates harddisk source tarball. .IP "\fIlh_source_iso\fR(1)" 4 creates CD/DVD source image. .IP "\fIlh_source_net\fR(1)" 4 diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1 index d02d09864..8b8f500ff 100644 --- a/manpages/make-live.de.1 +++ b/manpages/make-live.de.1 @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "04.06.2007" "1.0~a13" "live\-helper" +.TH MAKE\-LIVE 1 "11.06.2007" "1.0~a14" "live\-helper" .SH NAME make\-live \- erstellt ein Debian Live-System @@ -58,8 +58,8 @@ make\-live \- erstellt ein Debian Live-System [\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] [\-\-grub\-splash \fIFILE\fR] [\-\-syslinux\-splash \fIFILE\fR] -[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] -[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] +[\-b|\-\-binary\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] +[\-s|\-\-source\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] [\-\-includes \fIPATH\fR] [\-\-templates \fIPATH\fR] [\-\-breakpoints] diff --git a/manpages/make-live.en.1 b/manpages/make-live.en.1 index a95ce307a..c7d9a391e 100644 --- a/manpages/make-live.en.1 +++ b/manpages/make-live.en.1 @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "2007\-06\-04" "1.0~a13" "live\-helper" +.TH MAKE\-LIVE 1 "2007\-06\-11" "1.0~a14" "live\-helper" .SH NAME make\-live \- build a Debian Live system @@ -58,8 +58,8 @@ make\-live \- build a Debian Live system [\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] [\-\-grub\-splash \fIFILE\fR] [\-\-syslinux\-splash \fIFILE\fR] -[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] -[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] +[\-b|\-\-binary\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] +[\-s|\-\-source\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] [\-\-includes \fIPATH\fR] [\-\-templates \fIPATH\fR] [\-\-breakpoints] |