From bd1a5ddc8203907eb40135303bea5488397ec5d0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:04:52 +0200 Subject: Adding live-helper 1.0~a8-1. --- debian/changelog | 8 + debian/cron.daily | 8 +- doc/ChangeLog | 32 + doc/NEWS | 7 + doc/README | 4 +- examples/daily-cron.sh | 14 +- examples/etch+beryl-cron.sh | 16 +- examples/etch-cron.sh | 16 +- examples/weekly-cron.sh | 14 +- functions/cache.sh | 4 +- functions/common.sh | 2 +- functions/defaults.sh | 50 +- functions/stagefile.sh | 25 +- helpers/lh_binary | 3 +- helpers/lh_binary_chroot | 5 +- helpers/lh_binary_debian-installer | 247 ++++++ helpers/lh_binary_encryption | 21 +- helpers/lh_binary_grub | 72 +- helpers/lh_binary_hdd | 5 +- helpers/lh_binary_includes | 19 +- helpers/lh_binary_iso | 15 +- helpers/lh_binary_linuximage | 15 +- helpers/lh_binary_localincludes | 5 +- helpers/lh_binary_manifest | 17 +- helpers/lh_binary_md5sum | 5 +- helpers/lh_binary_memtest | 11 +- helpers/lh_binary_net | 5 +- helpers/lh_binary_rootfs | 41 +- helpers/lh_binary_syslinux | 116 ++- helpers/lh_binary_usb | 157 ---- helpers/lh_binary_usb-hdd | 158 ++++ helpers/lh_binary_yaboot | 29 +- helpers/lh_bootstrap | 5 +- helpers/lh_bootstrap_cdebootstrap | 60 +- helpers/lh_bootstrap_debootstrap | 57 +- helpers/lh_chroot | 5 +- helpers/lh_chroot_apt | 5 +- helpers/lh_chroot_debianchroot | 5 +- helpers/lh_chroot_hacks | 5 +- helpers/lh_chroot_hooks | 5 +- helpers/lh_chroot_hosts | 5 +- helpers/lh_chroot_interactive | 5 +- helpers/lh_chroot_linuximage | 9 +- helpers/lh_chroot_localhooks | 5 +- helpers/lh_chroot_localincludes | 5 +- helpers/lh_chroot_localization | 9 +- helpers/lh_chroot_localpackages | 9 +- helpers/lh_chroot_localpackageslists | 9 +- helpers/lh_chroot_packages | 9 +- helpers/lh_chroot_packageslists | 9 +- helpers/lh_chroot_proc | 5 +- helpers/lh_chroot_resolv | 5 +- helpers/lh_chroot_sources | 135 ++- helpers/lh_chroot_symlinks | 5 +- helpers/lh_chroot_sysfs | 5 +- helpers/lh_chroot_sysvinit | 7 +- helpers/lh_chroot_sysvrc | 5 +- helpers/lh_chroot_tasks | 9 +- helpers/lh_clean | 9 +- helpers/lh_config | 60 +- helpers/lh_losetup | 5 +- helpers/lh_source | 7 +- helpers/lh_source_config | 5 +- helpers/lh_source_download | 7 +- helpers/lh_source_generic | 5 +- helpers/lh_source_hdd | 5 +- helpers/lh_source_iso | 5 +- helpers/lh_source_md5sum | 5 +- helpers/lh_source_net | 5 +- helpers/lh_source_usb | 112 --- helpers/lh_source_usb-hdd | 113 +++ helpers/lh_testroot | 4 + helpers/make-live | 2 +- .../etch/install/doc/FAQ/html/ch-basic_defs.html | 432 +--------- includes/etch/install/doc/FAQ/html/ch-compat.html | 387 +-------- .../etch/install/doc/FAQ/html/ch-contributing.html | 192 +---- .../etch/install/doc/FAQ/html/ch-customizing.html | 523 +----------- includes/etch/install/doc/FAQ/html/ch-faqinfo.html | 211 +---- .../etch/install/doc/FAQ/html/ch-ftparchives.html | 576 +------------ includes/etch/install/doc/FAQ/html/ch-getting.html | 375 +-------- includes/etch/install/doc/FAQ/html/ch-kernel.html | 316 +------ .../etch/install/doc/FAQ/html/ch-nexttime.html | 148 +--- .../etch/install/doc/FAQ/html/ch-pkg_basics.html | 864 +------------------ .../etch/install/doc/FAQ/html/ch-pkgtools.html | 937 +-------------------- .../etch/install/doc/FAQ/html/ch-redistrib.html | 171 +--- .../etch/install/doc/FAQ/html/ch-software.html | 402 +-------- includes/etch/install/doc/FAQ/html/ch-support.html | 526 +----------- .../etch/install/doc/FAQ/html/ch-uptodate.html | 480 +---------- includes/etch/install/doc/FAQ/html/footnotes.html | 113 +-- includes/etch/install/doc/FAQ/html/index.html | 312 +------ manpages/lh_binary.1.de | 8 +- manpages/lh_binary.1.en | 8 +- manpages/lh_bootstrap.1.de | 2 +- manpages/lh_bootstrap.1.en | 2 +- manpages/lh_bootstrap_cdebootstrap.1.de | 2 +- manpages/lh_bootstrap_cdebootstrap.1.en | 2 +- manpages/lh_bootstrap_debootstrap.1.de | 2 +- manpages/lh_bootstrap_debootstrap.1.en | 2 +- manpages/lh_build.1.de | 4 +- manpages/lh_build.1.en | 2 +- manpages/lh_chroot.1.de | 2 +- manpages/lh_chroot.1.en | 2 +- manpages/lh_clean.1.de | 2 +- manpages/lh_clean.1.en | 2 +- manpages/lh_source.1.de | 6 +- manpages/lh_source.1.en | 6 +- manpages/lh_testroot.1.de | 2 +- manpages/lh_testroot.1.en | 2 +- manpages/live-helper.7.de | 12 +- manpages/live-helper.7.en | 12 +- manpages/make-live.1.de | 6 +- manpages/make-live.1.en | 6 +- templates/syslinux/boot.txt | 3 + templates/syslinux/f1.txt | 20 +- templates/syslinux/f10.txt | 2 +- templates/syslinux/f2.txt | 23 + templates/syslinux/f3.txt | 22 +- templates/syslinux/f4.txt | 30 +- templates/syslinux/f5.txt | 23 + templates/syslinux/f6.txt | 23 + templates/syslinux/f7.txt | 23 + templates/syslinux/f8.txt | 46 +- templates/syslinux/f9.txt | 22 +- templates/syslinux/isolinux.cfg | 27 +- templates/syslinux/isolinux.txt | 3 - 125 files changed, 1509 insertions(+), 7709 deletions(-) create mode 100755 helpers/lh_binary_debian-installer delete mode 100755 helpers/lh_binary_usb create mode 100755 helpers/lh_binary_usb-hdd delete mode 100755 helpers/lh_source_usb create mode 100755 helpers/lh_source_usb-hdd mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-basic_defs.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-compat.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-contributing.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-customizing.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-faqinfo.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-ftparchives.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-getting.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-kernel.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-nexttime.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-pkg_basics.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-pkgtools.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-redistrib.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-software.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-support.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/ch-uptodate.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/footnotes.html mode change 100644 => 120000 includes/etch/install/doc/FAQ/html/index.html create mode 100644 templates/syslinux/boot.txt create mode 100644 templates/syslinux/f2.txt create mode 100644 templates/syslinux/f5.txt create mode 100644 templates/syslinux/f6.txt create mode 100644 templates/syslinux/f7.txt delete mode 100644 templates/syslinux/isolinux.txt diff --git a/debian/changelog b/debian/changelog index ff1db9268..fa71c72be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +live-helper (1.0~a8-1) unstable; urgency=medium + + * New upstream release: + - updated syslinux templates (Closes: #399658). + - removed forgotten set -x in the cron (Closes: #421105). + + -- Daniel Baumann Mon, 30 Apr 2007 00:00:00 +0200 + live-helper (1.0~a7-1) unstable; urgency=medium * New upstream release: diff --git a/debian/cron.daily b/debian/cron.daily index ccb9b2b31..633cc2569 100644 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -46,7 +46,9 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + 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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt fi if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] @@ -77,7 +79,9 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + 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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt fi if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ] diff --git a/doc/ChangeLog b/doc/ChangeLog index 307058002..31038c9b5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,35 @@ +2007-04-31 Daniel Baumann + + * helpers/*: + - Added LH_INITRAMFS. + - Splitted config/image into config/binary and config/source. + * Uploaded 1.0~a8-1. + +2007-04-26 Daniel Baumann + + * helpers/*: + - Implemented paranoid caching with LIVE_CACHE_INDICES, + LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build + images offline from the cache. + +2007-04-25 Daniel Baumann + + * helpers/lh_binary_usb, lh_source_usb: + - In preparation of adding support for usb-zip images, the usb binary + type is renamed to usb-hdd. + +2007-04-24 Daniel Baumann + + * functions/stagefile.sh: + - Requite_stagefile can require more than one stage. + * helpers/lh_binary_debian-installer: + - Added. + +2007-04-23 Daniel Baumann + + * helpers/lh_binary_includes, lh_binary_usb, lh_source_usb: + - Added workaround for vfat limitations. + 2007-04-23 Daniel Baumann * Makefile: diff --git a/doc/NEWS b/doc/NEWS index 94460a321..ebcd8a0f7 100644 --- a/doc/NEWS +++ b/doc/NEWS @@ -25,6 +25,13 @@ News: http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html * 2007-03-12: Uploaded first live-helper to Debian unstable. + http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1 + + * 2007-03-14: live-package is dead, long lives live-helper + http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html * 2007-04-19: Google Summer of Code 2007 http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html + + * 2007-04-26: New website design + http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/ diff --git a/doc/README b/doc/README index a7b9de92e..dec5fe755 100644 --- a/doc/README +++ b/doc/README @@ -63,7 +63,7 @@ |_ lh_binary_hdd |_ lh_binary_iso |_ lh_binary_net - |_ lh_binary_usb + |_ lh_binary_usb-hdd | |_ rm -f .stage/chroot_sources |_ lh_chroot_resolv remove @@ -84,7 +84,7 @@ |_ lh_source_hdd |_ lh_source_iso |_ lh_source_net - |_ lh_source_usb + |_ lh_source_usb-hdd | |_ rm -f .stage/chroot_sources |_ lh_chroot_resolv remove diff --git a/examples/daily-cron.sh b/examples/daily-cron.sh index 49156c5a0..9dbe245b4 100755 --- a/examples/daily-cron.sh +++ b/examples/daily-cron.sh @@ -58,7 +58,9 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + 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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt fi if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] @@ -76,7 +78,7 @@ do 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 ] + if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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 @@ -89,15 +91,17 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt +make-live -b usb-hdd -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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 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 + mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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-hdd-packages.txt # Moving images mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} diff --git a/examples/etch+beryl-cron.sh b/examples/etch+beryl-cron.sh index 69e2ba8d9..372f7e2c3 100755 --- a/examples/etch+beryl-cron.sh +++ b/examples/etch+beryl-cron.sh @@ -9,7 +9,7 @@ AUTOBUILD_DISTRIBUTIONS="etch" AUTOBUILD_PACKAGES_LISTS="gnome-desktop kde-desktop xfce-desktop" AUTOBUILD_OPTIONS="--apt-recommends disabled" -AUTOBUILD_DATE="r0_1.0~a7-1" +AUTOBUILD_DATE="r0_1.0~a8-1" AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live" AUTOBUILD_TEMPDIR="/srv/tmp" @@ -68,7 +68,9 @@ do cp /usr/share/live-helper/examples/beryl.sources.list debian-live/config/chroot_sources/beryl.build cp /usr/share/live-helper/examples/beryl.sources.list debian-live/config/chroot_sources/beryl.image - 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + 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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt fi if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] @@ -86,7 +88,7 @@ do mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar fi - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ] + if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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 @@ -99,15 +101,17 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + make-live -b usb-hdd -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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 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-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt - cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt + mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt + cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt # Moving images mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} diff --git a/examples/etch-cron.sh b/examples/etch-cron.sh index d5ec6e7f8..0e526f712 100755 --- a/examples/etch-cron.sh +++ b/examples/etch-cron.sh @@ -9,7 +9,7 @@ AUTOBUILD_DISTRIBUTIONS="etch" AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" AUTOBUILD_OPTIONS="--apt-recommends disabled" -AUTOBUILD_DATE="r0_1.0~a7-1" +AUTOBUILD_DATE="r0_1.0~a8-1" AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live" AUTOBUILD_TEMPDIR="/srv/tmp" @@ -58,7 +58,9 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + 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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt fi if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] @@ -76,7 +78,7 @@ do 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 ] + if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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 @@ -89,15 +91,17 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + make-live -b usb-hdd -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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 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 + mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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-hdd-packages.txt # Moving images mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} diff --git a/examples/weekly-cron.sh b/examples/weekly-cron.sh index 18780eb61..4d87671ed 100755 --- a/examples/weekly-cron.sh +++ b/examples/weekly-cron.sh @@ -58,7 +58,9 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + 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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt fi if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] @@ -76,7 +78,7 @@ do 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 ] + if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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 @@ -89,15 +91,17 @@ do # 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 + echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt + make-live -b usb-hdd -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 + echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 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 + mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-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-hdd-packages.txt # Moving images mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} diff --git a/functions/cache.sh b/functions/cache.sh index a80245a27..94d6bc2bc 100755 --- a/functions/cache.sh +++ b/functions/cache.sh @@ -13,7 +13,7 @@ Restore_cache () { DIRECTORY="${1}" - if [ "${LH_CACHE}" = "enabled" ] + if [ "${LH_CACHE_PACKAGES}" = "enabled" ] then if [ -d "${DIRECTORY}" ] then @@ -27,7 +27,7 @@ Save_cache () { DIRECTORY="${1}" - if [ "${LH_CACHE}" = "enabled" ] + if [ "${LH_CACHE_PACKAGES}" = "enabled" ] then # Cleaning current cache Chroot "apt-get autoclean" diff --git a/functions/common.sh b/functions/common.sh index a56863859..d9642bfa0 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a7" +VERSION="1.0~a8" diff --git a/functions/defaults.sh b/functions/defaults.sh index 433360870..0c923b60b 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -120,9 +120,19 @@ Set_defaults () fi # Setting cache option - if [ -z "${LH_CACHE}" ] + if [ -z "${LH_CACHE_INDICES}" ] then - LH_CACHE="enabled" + LH_CACHE_INDICES="disabled" + fi + + if [ -z "${LH_CACHE_PACKAGES}" ] + then + LH_CACHE_PACKAGES="enabled" + fi + + if [ -z "${LH_CACHE_STAGES}" ] + then + LH_CACHE_STAGES="bootstrap" fi # Setting debconf frontend @@ -176,6 +186,12 @@ Set_defaults () LH_TASKSEL="aptitude" fi + # Setting initramfs generator + if [ -z "${LH_INITRAMFS}" ] + then + LH_INITRAMFS="casper" + fi + # Setting root directory if [ -z "${LIVE_ROOT}" ] then @@ -190,6 +206,18 @@ Set_defaults () esac fi + # 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 + # Setting live helper options if [ -z "${LH_BREAKPOINTS}" ] then @@ -549,6 +577,12 @@ Set_defaults () LIVE_MEMTEST="memtest86+" fi + # Setting debian-installer option + if [ -z "${LIVE_DEBIAN_INSTALLER}" ] + then + LIVE_DEBIAN_INSTALLER="disabled" + fi + # Setting iso volume if [ -z "${LIVE_ISO_VOLUME}" ] then @@ -608,16 +642,4 @@ Set_defaults () # 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 } diff --git a/functions/stagefile.sh b/functions/stagefile.sh index a570ea261..b4938ccc6 100755 --- a/functions/stagefile.sh +++ b/functions/stagefile.sh @@ -47,13 +47,28 @@ Create_stagefile () Require_stagefile () { - FILE="${1}" - NAME="`basename ${1}`" + FILES="${@}" + NUMBER="`echo ${@} | wc -w`" - # Checking stage file - if [ ! -f "${FILE}" ] + for FILE in ${FILES} + do + # Find at least one of the required stages + if [ -f ${FILE} ] + then + CONTINUE="true" + NAME="${NAME} `basename ${FILE}`" + fi + done + + if [ "${CONTINUE}" != "true" ] then - Echo_error "${NAME} missing" + if [ "${NUMBER}" -gt 1 ] + then + Echo_error "one of ${NAME} is missing" + else + Echo_error "${NAME} missing" + fi + exit 1 fi } diff --git a/helpers/lh_binary b/helpers/lh_binary index 8498d93bf..c3575cd16 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -42,6 +42,7 @@ lh_binary_encryption "${@}" # Prepare images lh_binary_linuximage "${@}" +lh_binary_debian-installer "${@}" lh_binary_memtest "${@}" lh_binary_grub "${@}" lh_binary_syslinux "${@}" @@ -54,7 +55,7 @@ lh_binary_md5sum "${@}" lh_binary_hdd "${@}" lh_binary_iso "${@}" lh_binary_net "${@}" -lh_binary_usb "${@}" +lh_binary_usb-hdd "${@}" # Deconfiguring chroot rm -f .stage/chroot_sources diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index 58835ad07..b92f94a62 100755 --- a/helpers/lh_binary_chroot +++ b/helpers/lh_binary_chroot @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_chroot: Init" diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer new file mode 100755 index 000000000..6d6d7847c --- /dev/null +++ b/helpers/lh_binary_debian-installer @@ -0,0 +1,247 @@ +#!/bin/sh + +# lh_binary_debian-installer(1) - install debian-installer into binary +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; 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 debian-installer into binary" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ] +then + exit 0 +fi + +Breakpoint "binary_debian-installer: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/binary_debian-installer + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Setting destination directory +case "${LIVE_BINARY_IMAGE}" in + iso) + DESTDIR="binary/install" + DESTDIR_INSTALLER="cdrom" + ;; + + net) + DESTDIR="tftpboot" + DESTDIR_INSTALLER="netboot" + + Echo_error "Not supported yet (FIXME)" + exit 1 + ;; + + usb-hdd|hdd) + DESTDIR="binary" + DESTDIR_INSTALLER="hd-media" + ;; +esac + +# Temporary check for broken syslinux +if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +then + # Assemble multi-arch + if [ -n "${MULTIARCH}" ] + then + case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR="${DESTDIR}.amd" + ;; + + i386) + DESTDIR="${DESTDIR}.386" + ;; + + powerpc) + DESTDIR="${DESTDIR}.ppc" + ;; + esac + fi +fi + +# Downloading debian-installer +mkdir -p "${DESTDIR}" + +wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz +wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz + +# Downloading graphical-installer +if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ] +then + mkdir -p "${DESTDIR}"/gtk + + wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz + wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz +fi + +# Downloading udebs +mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}" +cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}" +wget "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz +gunzip -c Packages.gz > Packages +cd "${OLDPWD}" + +for DISTRIBUTION in frozen stable testing unstable +do + ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION} +done + +DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`" +UDEBS="`echo ${DEBS} | grep '.*.udeb'`" + +rm -f packages.di + +for UDEB in ${UDEBS} +do + mkdir -p binary/`dirname ${UDEB}` + cd binary/`dirname ${UDEB}` + wget "${LIVE_MIRROR_BUILD}"/${UDEB} + cd "${OLDPWD}" +done + +# Downloading debs +if [ -d cache/packages_bootstrap ] +then + for FILE in cache/packages_bootstrap/*.deb + do + SOURCE="`dpkg -f ${FILE} Source`" + + if [ -z "${SOURCE}" ] + then + SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`" + fi + + case "${SOURCE}" in + lib?*) + LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`" + ;; + + *) + LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`" + ;; + esac + + # Install directory + mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}" + + # Move files + cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}" + done +fi + +mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE} + +cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF +Archive: ${LIVE_DISTRIBUTION} +Component: main +Origin: Debian +Label: Debian +Architecture: ${LIVE_ARCHITECTURE} +EOF + +mkdir -p cache/indices_debian-installer + +cat > cache/indices_debian-installer/archive << EOF +Dir +{ + ArchiveDir "binary"; + // OverrideDir ""; + // CacheDir ""; + FileListDir "cache/indices_debian-installer"; +}; + +Default +{ + Packages::Compress ". gzip"; + // Packages::Extension ".deb"; + // Sources::Extensions ".dsc"; + // Contents::Compress "gzip"; + // DeLinkLimit "0"; + // FileMode "0644"; +}; + +TreeDefault +{ + // MaxContentsChange + // ContentsAge + Directory "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/"; + Packages "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages"; + InternalPrefix "dists/\$(DIST)/\$(SECTION)/"; + Contents "dists/\$(DIST)/Contents-\$(ARCH)"; + // Contents::Header + // BinCacheDB "cache.\$(DIST).\$(SECTION).\$(ARCH)"; + // FileList "filelist.\$(DIST).\$(SECTION).\$(ARCH)"; + FileList "filelist"; + // BinOverride "override.\$(DIST).\$(SECTION)"; +}; + +tree "${LIVE_DISTRIBUTION}" +{ + Sections "main"; + Architectures "${LIVE_ARCHITECTURE}"; +}; +EOF + +cd binary +find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist +cd "${OLDPWD}" + +cat > cache/indices_debian-installer/release << EOF +APT::FTPArchive::Release::Origin "Debian"; +APT::FTPArchive::Release::Label "Debian"; +APT::FTPArchive::Release::Suite "${LIVE_DISTRIBUTION}"; +APT::FTPArchive::Release::Version "4.0"; +APT::FTPArchive::Release::Codename "${LIVE_DISTRIBUTION}"; +APT::FTPArchive::Release::Date "`date -R`"; +APT::FTPArchive::Release::Architectures "${LIVE_ARCHITECTURE}"; +APT::FTPArchive::Release::Components "main"; +EOF + +apt-ftparchive generate cache/indices_debian-installer/archive +apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release + +mkdir binary/.disk +echo "main" > binary/.disk/base_components +touch binary/.disk/base_installable +echo "not_complete" > binary/.disk/cd_type +#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info +echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info +touch binary/.disk/mkisofs + +# Creating stage file +Create_stagefile .stage/binary_debian-installer diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index d660b522f..e40420788 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ -z "${LIVE_ENCRYPTION}" ] @@ -51,6 +52,16 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock +case "${LH_INITRAMFS}" in + casper) + INITFS="casper" + ;; + + live-initramfs) + INITFS="live" + ;; +esac + case "${LIVE_FILESYSTEM}" in ext2) ROOTFS="ext2" @@ -73,9 +84,9 @@ Check_package chroot/usr/bin/aespipe aespipe Install_package # Moving image -mv binary/casper/filesystem.${LIVE_FILESYSTEM} chroot +mv binary/${INITFS}/filesystem.${LIVE_FILESYSTEM} chroot -echo "Encrypting binary/casper/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..." +echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..." cat >> chroot/encrypt << EOF while true @@ -97,7 +108,7 @@ EOF Chroot "sh encrypt" # Move image -mv chroot/filesystem.${LIVE_FILESYSTEM} binary/casper +mv chroot/filesystem.${LIVE_FILESYSTEM} binary/${INITFS} rm -f chroot/encrypt # Removing depends diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index 894815e91..35e3e4867 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ "${LIVE_BOOTLOADER}" != "grub" ] @@ -74,10 +75,21 @@ Check_package chroot/usr/sbin/grub grub # Installing depends Install_package +case "${LH_INITRAMFS}" in + casper) + INITFS="casper" + ;; + + live-initramfs) + INITFS="live" + ;; +esac + # Setting destination directory case "${LIVE_BINARY_IMAGE}" in - iso|usb|hdd) - DESTDIR="binary/live" + iso|usb-hdd|hdd) + DESTDIR_LIVE="binary/live" + DESTDIR_INSTALL="binary/install" ;; net) @@ -93,17 +105,23 @@ then if [ -n "${MULTIARCH}" ] then case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR_LIVE="${DESTDIR_LIVE}.amd" + DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd" + ;; + i386) - DESTDIR="${DESTDIR}.386" + DESTDIR_LIVE="${DESTDIR_LIVE}.386" + DESTDIR_INSTALL="${DESTDIR_INSTALL}.386" ;; esac fi fi # Creating directory -if [ ! -d "${DESTDIR}" ] +if [ ! -d "${DESTDIR_LIVE}" ] then - mkdir -p "${DESTDIR}" + mkdir -p "${DESTDIR_LIVE}" fi # Setting boot parameters @@ -129,8 +147,9 @@ 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-//'`" + +LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`" +LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`" if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] then @@ -138,21 +157,37 @@ then 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-//'`" + LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`" + LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`" else - LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR}`/`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-//'`" + LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`" + LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`" fi done fi LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`" +# Assembling debian-installer configuration +if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] +then + LINUX="title\t\tLive:\nroot\n\n${LINUX}" + + LIVE_KERNEL_INSTALL="title\t\tInstaller:\nroot" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" +fi + # Assembling memtest configuration -if [ -f "${DESTDIR}"/memtest ] +if [ -f "${DESTDIR_LIVE}"/memtest ] then - MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR}`/memtest" + MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest" MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`" fi @@ -166,7 +201,7 @@ case ${LIVE_BINARY_IMAGE} in cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub ;; - usb|hdd) + usb-hdd|hdd) cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub ;; esac @@ -185,7 +220,7 @@ then rm -f binary/boot/grub/splash.xpm.gz # Removing splash entry - sed -e "s/splashimage.*//" binary/boot/grub/menu.lst + sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst else # Overwriting splash file cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz @@ -194,8 +229,7 @@ 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 diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_hdd index 545ae84b8..a3af088fd 100755 --- a/helpers/lh_binary_hdd +++ b/helpers/lh_binary_hdd @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index 18ad540e8..15d898d41 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ "${LIVE_INCLUDES}" = "none" ] @@ -79,17 +80,23 @@ esac if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] then + # Working arround vfat limitations + if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ] + then + CP_OPTIONS="--preserve=link,mode,timestamps" + fi + # Copying d-i templates if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \ ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null then - cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary + cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary fi if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \ ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null then - cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary + cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary fi # Adjusting d-i templates @@ -105,8 +112,8 @@ then DEBIAN_TOOLS_TXT="/tools/" fi - sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html - sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_TXT}/g" binary/README.txt + sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html + sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt fi # Creating stage file diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index b22b3b40b..a949ff6f3 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults for IMAGE in ${LIVE_BINARY_IMAGE} @@ -63,7 +64,7 @@ do if [ "${LH_VERBOSE}" = "enabled" ] then - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -i" + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" fi # Moving image @@ -74,19 +75,19 @@ do then case "${LIVE_BOOTLOADER}" in grub) - Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -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" + Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -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@lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@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} ${GENISOIMAGE_OPTIONS} -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" + #Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -cache-inodes -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary" + Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -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@lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary" - Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary" + Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary -cache-inodes" fi # Move image diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage index 600aeaa81..629ef7782 100755 --- a/helpers/lh_binary_linuximage +++ b/helpers/lh_binary_linuximage @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_linuximage: Init" @@ -58,7 +59,7 @@ case "${LIVE_BINARY_IMAGE}" in DESTDIR="tftpboot" ;; - usb|hdd) + usb-hdd|hdd) DESTDIR="binary" ;; esac @@ -70,9 +71,17 @@ then if [ -n "${MULTIARCH}" ] then case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR="${DESTDIR}.amd" + ;; + i386) DESTDIR="${DESTDIR}.386" ;; + + powerpc) + DESTDIR="${DESTDIR}.ppc" + ;; esac fi fi diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_localincludes index dcbaa2cf2..2c1f7524c 100755 --- a/helpers/lh_binary_localincludes +++ b/helpers/lh_binary_localincludes @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_localincludes: Init" diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest index f8c389909..87883c32f 100755 --- a/helpers/lh_binary_manifest +++ b/helpers/lh_binary_manifest @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_manifest: Init" @@ -45,8 +46,18 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock +case "${LH_INITRAMFS}" in + casper) + INITFS="casper" + ;; + + live-initramfs) + INITFS="live" + ;; +esac + # Add filesystem.manifest -Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/casper/filesystem.manifest +Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest # Add packages.list Chroot "dpkg -l" > packages.txt diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index 59864ce46..8964593ba 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_md5sum: Init" diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index ea0742276..edf3830ed 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ "${LIVE_MEMTEST}" = "disabled" ] @@ -80,7 +81,7 @@ case "${LIVE_BINARY_IMAGE}" in DESTDIR="tftpboot" ;; - usb|hdd) + usb-hdd|hdd) DESTDIR="binary" ;; esac @@ -92,6 +93,10 @@ then if [ -n "${MULTIARCH}" ] then case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR="${DESTDIR}.amd" + ;; + i386) DESTDIR="${DESTDIR}.386" ;; diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index f07e5e612..47ed7d238 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_net: Init" diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 12ac0bba7..ce93038dc 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "binary_rootfs: Init" @@ -46,10 +47,20 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock +case "${LH_INITRAMFS}" in + casper) + INITFS="casper" + ;; + + live-initramfs) + INITFS="live" + ;; +esac + # Creating directory -if [ ! -d binary/casper ] +if [ ! -d binary/${INITFS} ] then - mkdir -p binary/casper + mkdir -p binary/${INITFS} fi case "${LIVE_FILESYSTEM}" in @@ -61,9 +72,9 @@ case "${LIVE_FILESYSTEM}" in Install_package # Remove old ext2 image - if [ -f binary/casper/filesystem.ext2 ] + if [ -f binary/${INITFS}/filesystem.ext2 ] then - rm -f binary/casper/filesystem.ext2 + rm -f binary/${INITFS}/filesystem.ext2 fi DU_DIM="`du -ks chroot | cut -f1`" @@ -72,7 +83,7 @@ case "${LIVE_FILESYSTEM}" in Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2" # Move image - mv chroot/filesystem.ext2 binary/casper + mv chroot/filesystem.ext2 binary/${INITFS} rm -rf chroot/chroot # Removing depends @@ -80,12 +91,12 @@ case "${LIVE_FILESYSTEM}" in ;; plain) - if [ -d binary/casper/filesystem.dir ] + if [ -d binary/${INITFS}/filesystem.dir ] then - rm -rf binary/casper/filesystem.dir + rm -rf binary/${INITFS}/filesystem.dir fi - mv chroot/chroot binary/casper/filesystem.dir + mv chroot/chroot binary/${INITFS}/filesystem.dir ;; squashfs) @@ -96,12 +107,12 @@ case "${LIVE_FILESYSTEM}" in Install_package # Remove old squashfs image - if [ -f binary/casper/filesystem.squashfs ] + if [ -f binary/${INITFS}/filesystem.squashfs ] then - rm -f binary/casper/filesystem.squashfs + rm -f binary/${INITFS}/filesystem.squashfs fi - if [ "${LH_QUIET}" = "enabled" ] + if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress" fi @@ -120,12 +131,12 @@ case "${LIVE_FILESYSTEM}" in fi # Move image - ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/casper + ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS} ${LH_ROOT_COMMAND} rm -rf chroot/chroot if [ -n "${LH_ROOT_COMMAND}" ] then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/casper + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/${INITFS} fi # Removing depends diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 6864f3260..4ca64086f 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ "${LIVE_BOOTLOADER}" != "syslinux" ] @@ -74,18 +75,31 @@ Check_package chroot/usr/bin/syslinux syslinux # Installing depends Install_package +case "${LH_INITRAMFS}" in + casper) + INITFS="casper" + ;; + + live-initramfs) + INITFS="live" + ;; +esac + # Setting destination directory case "${LIVE_BINARY_IMAGE}" in iso) - DESTDIR="binary/live" + DESTDIR_LIVE="binary/live" + DESTDIR_INSTALL="binary/install" ;; net) - DESTDIR="tftpboot" + DESTDIR_LIVE="tftpboot" + DESTDIR_INSTALL="tftpboot" ;; - usb|hdd) - DESTDIR="binary" + usb-hdd|hdd) + DESTDIR_LIVE="binary" + DESTDIR_INSTALL="binary" ;; esac @@ -96,17 +110,23 @@ then if [ -n "${MULTIARCH}" ] then case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR_LIVE="${DESTDIR_LIVE}.amd" + DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd" + ;; + i386) - DESTDIR="${DESTDIR}.386" + DESTDIR_LIVE="${DESTDIR_LIVE}.386" + DESTDIR_INSTALL="${DESTDIR_INSTALL}.386" ;; esac fi fi # Creating directory -if [ ! -d "${DESTDIR}" ] +if [ ! -d "${DESTDIR_LIVE}" ] then - mkdir -p "${DESTDIR}" + mkdir -p "${DESTDIR_LIVE}" fi # Setting boot parameters @@ -134,12 +154,12 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" 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}\n\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}" + LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" + LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" 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}\n\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}" + LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" + LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" fi if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] @@ -150,20 +170,20 @@ then 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}\n\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}" + LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" + LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" else - LINUX="label live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper live_BOOTAPPEND" - LINUX="${LINUX}\n\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}" + LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND" + LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" fi else if [ "${LIVE_BINARY_IMAGE}" = "iso" ] then - LINUX="${LINUX}\n\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}\n\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}" + LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" + LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" else - LINUX="${LINUX}\n\nlabel live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND" - LINUX="${LINUX}\n\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}" + LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" + LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" fi fi done @@ -172,15 +192,29 @@ fi # Removing '//' LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`" +# Assembling debian-installer configuration +if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] +then + LIVE_KERNEL_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- \n\n" + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " + LIVE_KENREL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- " + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- " + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " +fi + # Assembling memtest configuration -if [ -f "${DESTDIR}"/memtest ] +if [ -f "${DESTDIR_LIVE}"/memtest ] then if [ "${LIVE_BINARY_IMAGE}" = "iso" ] then - MEMTEST="label memtest\n kernel /`basename ${DESTDIR}`/memtest" + MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest" MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`" else - MEMTEST="label memtest\n kernel memtest" + MEMTEST="LABEL memtest\n\tkernel memtest" fi fi @@ -202,7 +236,7 @@ case "${LIVE_BINARY_IMAGE}" in if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ] then rm -f binary/isolinux/splash.rle - sed -e "s/.*splash.*//" binary/isolinux/isolinux.txt + sed -e "s/.*splash.*//" binary/isolinux/boot.txt else cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle fi @@ -224,13 +258,13 @@ case "${LIVE_BINARY_IMAGE}" in do NUMBER=$(($NUMBER + 1)) - mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER} - mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img + mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER} + mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg done else - mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz - mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img + mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz + mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg fi ;; @@ -243,7 +277,7 @@ case "${LIVE_BINARY_IMAGE}" in 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 + sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt # Copying splash screen if [ -f config/binary_syslinux/splash.rle ] @@ -256,7 +290,7 @@ case "${LIVE_BINARY_IMAGE}" in if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ] then rm -f tftpboot/pxelinux.cfg/splash.rle - sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/isolinux.txt + sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt else cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle fi @@ -278,25 +312,23 @@ case "${LIVE_BINARY_IMAGE}" in do NUMBER=$(($NUMBER + 1)) - mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER} - mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img + mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER} + mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg done else - mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz - mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img + mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz + mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg fi ;; - usb|hdd) + usb-hdd|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 ] @@ -331,13 +363,13 @@ case "${LIVE_BINARY_IMAGE}" in do NUMBER=$(($NUMBER + 1)) - mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER} - mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img + mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER} + mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/syslinux.cfg done else - mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz - mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img + mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz + mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/syslinux.cfg fi ;; diff --git a/helpers/lh_binary_usb b/helpers/lh_binary_usb deleted file mode 100755 index e0c019331..000000000 --- a/helpers/lh_binary_usb +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/sh - -# lh_binary_usb(1) - build binary image -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; 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 - - # Checking depends - Check_package chroot/sbin/mkdosfs dosfstools - Check_package chroot/usr/sbin/mtools mtools - Check_package chroot/sbin/parted parted - - case "${LIVE_BOOTLOADER}" in - grub) - Check_package chroot/usr/sbin/grub grub - ;; - - syslinux) - Check_package chroot/usr/bin/syslinux syslinux - ;; - esac - - # Installing depends - Install_package - - # Remove old binary - if [ -f binary.img ] - then - rm -f binary.img - fi - - # Everything which comes here needs to be cleaned up, - DU_DIM="`du -ms binary | cut -f1`" - REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 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 - ${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp - cp -r binary/* binary.tmp - ${LH_ROOT_COMMAND} umount binary.tmp - rmdir binary.tmp - - if [ "${LIVE_BOOTLOADER}" = "syslinux" ] - then - Chroot "syslinux ${FREELO}" - fi - - ${LH_LOSETUP} -d ${FREELO} - - #if [ "${LIVE_BOOTLOADER}" = "grub" ] - #then - # FREELO="`${LH_LOSETUP} -f`" - # lh_losetup $FREELO binary.img 0 - - # dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1 - # dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1 - - # ${LH_LOSETUP} -d ${FREELO} - #fi - echo "!!! The above error/warning messages can be ignored !!!" - - if [ -n "${MAKEDEV}" ] - then - rm -f chroot/dev - mv chroot/dev.tmp chroot/dev - fi - - # Removing depends - Remove_package - - # Creating stage file - Create_stagefile .stage/binary_usb - fi -done diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd new file mode 100755 index 000000000..8a8f144cf --- /dev/null +++ b/helpers/lh_binary_usb-hdd @@ -0,0 +1,158 @@ +#!/bin/sh + +# lh_binary_usb-hdd(1) - build binary image +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; 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/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "binary_usb-hdd: Init" + +for IMAGE in ${LIVE_BINARY_IMAGE} +do + if [ "${IMAGE}" = "usb-hdd" ] + then + # Requiring stage file + Require_stagefile .stage/bootstrap + Require_stagefile .stage/chroot_proc + + # Checking stage file + Check_stagefile .stage/binary_usb-hdd + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Checking depends + Check_package chroot/sbin/mkdosfs dosfstools + Check_package chroot/usr/sbin/mtools mtools + Check_package chroot/sbin/parted parted + + case "${LIVE_BOOTLOADER}" in + grub) + Check_package chroot/usr/sbin/grub grub + ;; + + syslinux) + Check_package chroot/usr/bin/syslinux syslinux + ;; + esac + + # Installing depends + Install_package + + # Remove old binary + if [ -f binary.img ] + then + rm -f binary.img + fi + + # Everything which comes here needs to be cleaned up, + DU_DIM="`du -ms binary | cut -f1`" + REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 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.vfat -F 16 -n DEBIAN_LIVE ${FREELO}" + mkdir -p binary.tmp + ${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp + cp -r binary/* binary.tmp + ${LH_ROOT_COMMAND} umount binary.tmp + rmdir binary.tmp + + if [ "${LIVE_BOOTLOADER}" = "syslinux" ] + then + Chroot "syslinux ${FREELO}" + fi + + ${LH_LOSETUP} -d ${FREELO} + + #if [ "${LIVE_BOOTLOADER}" = "grub" ] + #then + # FREELO="`${LH_LOSETUP} -f`" + # lh_losetup $FREELO binary.img 0 + + # dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1 + # dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1 + + # ${LH_LOSETUP} -d ${FREELO} + #fi + echo "!!! The above error/warning messages can be ignored !!!" + + if [ -n "${MAKEDEV}" ] + then + rm -f chroot/dev + mv chroot/dev.tmp chroot/dev + fi + + # Removing depends + Remove_package + + # Creating stage file + Create_stagefile .stage/binary_usb-hdd + fi +done diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index e4a1b65e5..7f82d404f 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ "${LIVE_BOOTLOADER}" != "yaboot" ] @@ -74,13 +75,23 @@ Check_package chroot/usr/lib/yaboot/yaboot yaboot # Installing depends Install_package +case "${LH_INITRAMFS}" in + casper) + INITFS="casper" + ;; + + live-initramfs) + INITFS="live" + ;; +esac + # Setting destination directory case "${LIVE_BINARY_IMAGE}" in iso) DESTDIR="binary/live" ;; - net|usb|hdd) + net|usb-hdd|hdd) Echo_error "not supported, FIXME" ;; esac @@ -123,10 +134,10 @@ LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" 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" + LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only" else DEFAULT_FLAVOUR="`echo ${LIVE_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" + LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only" fi # FIXME @@ -138,16 +149,16 @@ then 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="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" else - LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND" + LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" fi else if [ "${LIVE_BINARY_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-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" else - LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=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=${INITFS} LIVE_BOOTAPPEND" fi fi done diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index 2692a56fb..733fad344 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -30,10 +30,11 @@ Echo_debug "Init ${PROGRAM}" Breakpoint "bootstrap: Init" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults # Bootstrapping system diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 7aa2ea499..cc7ffca7e 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -28,10 +28,11 @@ lh_testroot Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "bootstrap_cdeboostrap: Init" @@ -91,12 +92,12 @@ fi if [ -x "/usr/bin/cdebootstrap" ] then - if [ "${LH_CACHE}" = "enabled" ] - then - # Restore old cache - if [ -d cache/chroot_bootstrap ] + for STAGE in ${LH_CACHE_STAGES} + do + if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] then - ${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap/* chroot + # Restore old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot if [ -n "${LH_ROOT_COMMAND}" ] then @@ -108,11 +109,14 @@ then exit 0 fi + done - if [ -d cache/bootstrap ] + if [ "${LH_CACHE_PACKAGES}" = "enabled" ] + then + if [ -d cache/packages_bootstrap ] then mkdir -p chroot/var/cache/bootstrap - cp cache/bootstrap/*.deb chroot/var/cache/bootstrap + cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap fi # Executing cdebootstrap (download-only) @@ -124,18 +128,18 @@ then fi # Removing old cache - if [ -d cache/bootstrap ] + if [ -d cache/packages_bootstrap ] then - rm -f cache/bootstrap/*.deb + rm -f cache/packages_bootstrap/*.deb fi # Saving new cache - if [ ! -d cache/bootstrap ] + if [ ! -d cache/packages_bootstrap ] then - mkdir -p cache/bootstrap + mkdir -p cache/packages_bootstrap fi - cp chroot/var/cache/bootstrap/*.deb cache/bootstrap + cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap fi # Executing cdebootstrap (regular run) @@ -158,26 +162,26 @@ then rm -f chroot/etc/resolv.conf # Removing bootstrap cache - if [ -d chroot/var/cache/bootstrap ] - then - rm -rf chroot/var/cache/bootstrap - fi + rm -rf chroot/var/cache/bootstrap # Saving new cache - if [ "${LH_CACHE}" = "enabled" ] - then - if [ -d cache/chroot_bootstrap ] + for STAGE in ${LH_CACHE_STAGES} + do + if [ "${STAGE}" = "bootstrap" ] then - rm -rf cache/chroot_bootstrap - fi + if [ -d cache/stages_bootstrap ] + then + rm -rf cache/stages_bootstrap + fi - ${LH_ROOT_COMMAND} cp -a chroot cache/chroot_bootstrap + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/chroot_bootstrap + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap + fi fi - fi + done # Creating stage file Create_stagefile .stage/bootstrap diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 43fdd9665..0538422b1 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -28,10 +28,11 @@ lh_testroot Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "bootstrap_debootstrap: Init" @@ -74,12 +75,12 @@ fi if [ -x "/usr/sbin/debootstrap" ] then - if [ "${LH_CACHE}" = "enabled" ] - then - # Restore old cache - if [ -d cache/chroot_bootstrap ] + for STAGE in ${LH_CACHE_STAGES} + do + if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] then - ${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap/* chroot + # Restore old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot if [ -n "${LH_ROOT_COMMAND}" ] then @@ -91,11 +92,14 @@ then exit 0 fi + done - if [ -d cache/bootstrap ] + if [ "${LH_CACHE_PACKAGES}" = "enabled" ] + then + if [ -d cache/packages_bootstrap ] then mkdir -p chroot/var/cache/apt/archives - cp cache/bootstrap/*.deb chroot/var/cache/apt/archives + cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives fi # Executing debootstrap (download-only) @@ -107,18 +111,18 @@ then fi # Removing old cache - if [ -d cache/bootstrap ] + if [ -d cache/packages_bootstrap ] then - rm -f cache/bootstrap/*.deb + rm -f cache/packages_bootstrap/*.deb fi # Saving new cache - if [ ! -d cache/bootstrap ] + if [ ! -d cache/packages_bootstrap ] then - mkdir -p cache/bootstrap + mkdir -p cache/packages_bootstrap fi - cp chroot/var/cache/apt/archives/*.deb cache/bootstrap + cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap fi # Executing debootstrap (regular run) @@ -130,23 +134,26 @@ then fi # Removing bootstrap cache - rm -rf chroot/var/cache/apt/archives/*.deb + rm -f chroot/var/cache/apt/archives/*.deb # Saving new cache - if [ "${LH_CACHE}" = "enabled" ] - then - if [ -d cache/chroot_bootstrap ] + for STAGE in ${LH_CACHE_STAGES} + do + if [ "${STAGE}" = "bootstrap" ] then - rm -rf cache/chroot_bootstrap - fi + if [ -d cache/stages_bootstrap ] + then + rm -rf cache/stages_bootstrap + fi - ${LH_ROOT_COMMAND} cp -a chroot cache/chroot_bootstrap + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/chroot_bootstrap + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap + fi fi - fi + done # Creating stage file Create_stagefile .stage/bootstrap diff --git a/helpers/lh_chroot b/helpers/lh_chroot index ab2dd8ef2..ed40c33b0 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot: Init" diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index cecd8abc5..c7cce8906 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_apt: Init" diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot index bc830289f..3c65f530a 100755 --- a/helpers/lh_chroot_debianchroot +++ b/helpers/lh_chroot_debianchroot @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_debianchroot: Init" diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index ec367fba0..ea746665b 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_hacks: Init" diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks index 796319382..3f874e6f3 100755 --- a/helpers/lh_chroot_hooks +++ b/helpers/lh_chroot_hooks @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_hooks: Init" diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts index 4262f60dd..3a7dec95c 100755 --- a/helpers/lh_chroot_hosts +++ b/helpers/lh_chroot_hosts @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_hosts: Init" diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive index 556f07916..e8c57738d 100755 --- a/helpers/lh_chroot_interactive +++ b/helpers/lh_chroot_interactive @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_interactive: Init" diff --git a/helpers/lh_chroot_linuximage b/helpers/lh_chroot_linuximage index e3d3786be..bd0c22895 100755 --- a/helpers/lh_chroot_linuximage +++ b/helpers/lh_chroot_linuximage @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_linuximage: Init" @@ -71,9 +72,9 @@ EOF done fi - PACKAGES="${PACKAGES} casper" + PACKAGES="${PACKAGES} ${LH_INITRAMFS}" - # Installing linux-image, modules and casper + # Installing linux-image, modules and ${LH_INITRAMFS} case "${LH_APT}" in apt|apt-get) Chroot "apt-get install --yes ${PACKAGES}" diff --git a/helpers/lh_chroot_localhooks b/helpers/lh_chroot_localhooks index 07a5c9c69..2dca7f7ba 100755 --- a/helpers/lh_chroot_localhooks +++ b/helpers/lh_chroot_localhooks @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_localhooks: Init" diff --git a/helpers/lh_chroot_localincludes b/helpers/lh_chroot_localincludes index 777cdd11d..40e9a76d2 100755 --- a/helpers/lh_chroot_localincludes +++ b/helpers/lh_chroot_localincludes @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_localincludes: Init" diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization index f81661d8b..914be81f1 100755 --- a/helpers/lh_chroot_localization +++ b/helpers/lh_chroot_localization @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_localization: Init" @@ -661,13 +662,13 @@ then done # Restoring cache - Restore_cache cache/chroot_localization + Restore_cache cache/packages_localization # Installing packages Install_package # Saving cache - Save_cache cache/chroot_localization + Save_cache cache/packages_localization # Creating stage file Create_stagefile .stage/chroot_localization diff --git a/helpers/lh_chroot_localpackages b/helpers/lh_chroot_localpackages index 6beee2d7b..516e08a21 100755 --- a/helpers/lh_chroot_localpackages +++ b/helpers/lh_chroot_localpackages @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_localpackages: Init" @@ -48,7 +49,7 @@ Create_lockfile .lock if ls config/chroot_localpackages/*.deb &> /dev/null then # Restoring cache - Restore_cache cache/chroot_localpackages + Restore_cache cache/packages_localpackages # Copying packages cp config/chroot_localpackages/*.deb chroot/root @@ -73,7 +74,7 @@ then rm -f chroot/root/localpackages # Saving cache - Save_cache cache/chroot_localpackages + Save_cache cache/packages_localpackages # Creating stage file Create_stagefile .stage/chroot_localpackages diff --git a/helpers/lh_chroot_localpackageslists b/helpers/lh_chroot_localpackageslists index a8459ef6a..4cda34ecd 100755 --- a/helpers/lh_chroot_localpackageslists +++ b/helpers/lh_chroot_localpackageslists @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_localpackageslists: Init" @@ -48,7 +49,7 @@ Create_lockfile .lock if ls config/chroot_localpackageslists/* &> /dev/null then # Restoring cache - Restore_cache cache/chroot_localpackageslists + Restore_cache cache/packages_localpackageslists for PACKAGESLIST in config/chroot_localpackageslists/* do @@ -71,7 +72,7 @@ then done # Saving cache - Save_cache cache/chroot_localpackageslists + Save_cache cache/packages_localpackageslists # Creating stage file Create_stagefile .stage/chroot_localpackageslists diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages index 5b38fccb7..5721959d2 100755 --- a/helpers/lh_chroot_packages +++ b/helpers/lh_chroot_packages @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_packages: Init" @@ -48,7 +49,7 @@ Create_lockfile .lock if [ -n "${LIVE_PACKAGES}" ] then # Restoring cache - Restore_cache cache/chroot_packages + Restore_cache cache/packages_packages # Installing packages case "${LH_APT}" in @@ -62,7 +63,7 @@ then esac # Saving cache - Save_cache cache/chroot_packages + Save_cache cache/packages_packages # Creating stage file Create_stagefile .stage/chroot_packages diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index 18405bd15..fc915f4b7 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_packageslists @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_packageslists: Init" @@ -48,7 +49,7 @@ Create_lockfile .lock if [ -n "${LIVE_PACKAGES_LISTS}" ] then # Restoring cache - Restore_cache cache/chroot_packageslists + Restore_cache cache/packages_packageslists for LIST in ${LIVE_PACKAGES_LISTS} do @@ -74,7 +75,7 @@ then done # Saving cache - Save_cache cache/chroot_packageslists + Save_cache cache/packages_packageslists # Creating stage file Create_stagefile .stage/chroot_packageslists diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index 6eeec9dd8..563dbb412 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -28,10 +28,11 @@ lh_testroot Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_proc: Init" diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index 71143f206..8197b8ac9 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_resolv: Init" diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 7d0980db7..cb8962715 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_sources: Init" @@ -93,48 +94,110 @@ case "${1}" in done fi - # Check local gpg keys - if ls config/chroot_sources/*.build.gpg &> /dev/null + # Update indices from cache + if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_build ] 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 + if ls cache/indices_build/secring.gpg* &> /dev/null + then + cp -f cache/indices_build/secring.gpg* chroot/etc/apt + 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 + if ls cache/indices_build/trusted.gpg* &> /dev/null + then + cp -f cache/indices_build/trusted.gpg* chroot/etc/apt + 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 ] + if [ -f cache/indices_build/pkgcache.bin ] + then + cp -f cache/indices_build/pkgcache.bin chroot/var/cache/apt + fi + + if [ -f cache/indices_build/srcpkgcache.bin ] + then + cp -f cache/indices_build/srcpkgcache.bin chroot/var/cache/apt + fi + + if ls cache/indices_build/*_Packages &> /dev/null + then + cp -f cache/indices_build/*_Packages chroot/var/lib/apt/lists + fi + + if ls cache/indices_build/*_Sources &> /dev/null + then + cp -f cache/indices_build/*_Sources chroot/var/lib/apt/lists + fi + + if ls cache/indices_build/*_Release* &> /dev/null + then + cp -f cache/indices_build/*_Release* chroot/var/lib/apt/lists + fi + + if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] then - Chroot "apt-get update" Chroot "apt-get install --yes --force-yes aptitude" fi + else # Get fresh indices + # 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 - Chroot "aptitude update" - 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 keyring packages - if [ -n "${LIVE_KEYRING_PACKAGES}" ] - then - Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}" - Chroot "apt-get update" + # Installing aptitude + if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ] + then + Chroot "apt-get update" + elif [ "${LH_APT}" = "aptitude" ] + then + if [ ! -x /usr/bin/aptitude ] + then + Chroot "apt-get update" + Chroot "apt-get install --yes --force-yes aptitude" + fi + + Chroot "aptitude update" + fi + + # Installing keyring packages + if [ -n "${LIVE_KEYRING_PACKAGES}" ] + then + Chroot "apt-get install --yes --force-yes ${LIVE_KEYRING_PACKAGES}" + Chroot "apt-get update" + fi + + if [ "${LH_CACHE_INDICES}" = "enabled" ] + then + if [ ! -d cache/indices_build ] + then + mkdir -p cache/indices_build + fi + + cp -f chroot/etc/apt/secring.gpg* cache/indices_build + cp -f chroot/etc/apt/trusted.gpg* cache/indices_build + + cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_build + cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_build + + cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_build + cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_build + cp -f chroot/var/lib/apt/*_Release* cache/indices_build + fi fi # Creating stage file diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks index 2aef0dffc..2f89d4123 100755 --- a/helpers/lh_chroot_symlinks +++ b/helpers/lh_chroot_symlinks @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_symlinks: Init" diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index 5cf50c3cf..244369c4b 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -28,10 +28,11 @@ lh_testroot Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_sysfs: Init" diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index 4cee00bcb..16f40f106 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_sysvinit: Init" @@ -54,7 +55,7 @@ then done # Re-enable all required (taken from -f standard chroot) - for PACKAGE in casper console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux + for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux do if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ] then diff --git a/helpers/lh_chroot_sysvrc b/helpers/lh_chroot_sysvrc index 891323600..1729f4684 100755 --- a/helpers/lh_chroot_sysvrc +++ b/helpers/lh_chroot_sysvrc @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_sysvrc: Init" diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks index 64cd47f35..0e096d4b5 100755 --- a/helpers/lh_chroot_tasks +++ b/helpers/lh_chroot_tasks @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "chroot_tasks: Init" @@ -48,7 +49,7 @@ Create_lockfile .lock if [ -n "${LIVE_TASKS}" ] then # Restoring cache - Restore_cache cache/chroot_tasks + Restore_cache cache/packages_tasks # Checking depends case "${LH_TASKSEL}" in @@ -82,7 +83,7 @@ then Remove_package # Saving cache - Save_cache cache/chroot_tasks + Save_cache cache/packages_tasks # Creating stage file Create_stagefile .stage/chroot_tasks diff --git a/helpers/lh_clean b/helpers/lh_clean index 24a65e3f9..f016e9504 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults case "${1}" in @@ -60,9 +61,9 @@ case "${1}" in ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp - if [ "${PURGE}" != "true" ] && [ -d cache/chroot_bootstrap ] + if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ] then - ${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap chroot + ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot mkdir -p .stage touch .stage/bootstrap fi diff --git a/helpers/lh_config b/helpers/lh_config index 4f3e84422..3b4f940bf 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -46,7 +46,8 @@ then Read_conffile "${LIVE_ROOT}"/config/common Read_conffile "${LIVE_ROOT}"/config/bootstrap Read_conffile "${LIVE_ROOT}"/config/chroot - Read_conffile "${LIVE_ROOT}"/config/image + Read_conffile "${LIVE_ROOT}"/config/binary + Read_conffile "${LIVE_ROOT}"/config/source fi # Setting defaults @@ -97,9 +98,17 @@ LH_APT_SECURE="${LH_APT_SECURE}" # (Default: ${LH_BOOTSTRAP}) LH_BOOTSTRAP="${LH_BOOTSTRAP}" -# \$LH_CACHE: control if downloaded packages should be cached -# (Default: ${LH_CACHE}) -LH_CACHE="${LH_CACHE}" +# \$LH_CACHE_INDICES: control if downloaded packages should be cached +# (Default: ${LH_CACHE_INDICES}) +LH_CACHE_INDICES="${LH_CACHE_INDICES}" + +# \$LH_CACHE_PACKAGES: control if downloaded packages should be cached +# (Default: ${LH_CACHE_PACKAGES}) +LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}" + +# \$LH_CACHE_STAGES: control if downloaded packages should be cached +# (Default: ${LH_CACHE_STAGES}) +LH_CACHE_STAGES="${LH_CACHE_STAGES}" # \$LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use # (Default: ${LH_DEBCONF_FRONTEND}) @@ -125,10 +134,22 @@ LH_LOSETUP="${LH_LOSETUP}" # (Default: ${LH_TASKSEL}) LH_TASKSEL="${LH_TASKSEL}" +# \$LH_INITRAMFS: set the initramfs generator +# (Default: ${LH_INITRAMFS}) +LH_INITRAMFS="${LH_INITRAMFS}" + # \$LIVE_ROOT: set the root directory # (Default: ${LIVE_ROOT}) LIVE_ROOT="${LIVE_ROOT}" +# \$LIVE_INCLUDES: set includes +# (Default: ${LIVE_INCLUDES}) +LIVE_INCLUDES="${LIVE_INCLUDES}" + +# \$LIVE_TEMPLATES: set templates +# (Default: ${LIVE_TEMPLATES}) +LIVE_TEMPLATES="${LIVE_TEMPLATES}" + # Live-helper options # \$LH_ROOT_COMMAND: use sudo or equivalent @@ -257,9 +278,9 @@ LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" EOF -# Creating lh_image_* configuration -cat > "${LIVE_ROOT}"/config/image << EOF -# config/chroot: configuration for lh_image_* +# Creating lh_binary_* configuration +cat > "${LIVE_ROOT}"/config/binary << EOF +# config/chroot: configuration for lh_binary_* # \$LIVE_BOOTAPPEND: set boot parameters # (Default: empty) @@ -285,6 +306,10 @@ LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" # (Default: ${LIVE_MEMTEST}) LIVE_MEMTEST="${LIVE_MEMTEST}" +# \$LIVE_DEBIAN_INSTALLER: set debian-installer +# (Default: ${LIVE_DEBIAN_INSTALLER}) +LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}" + # \$LIVE_ISO_VOLUME: set iso volume # (Default: ${LIVE_ISO_VOLUME}) LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" @@ -297,10 +322,6 @@ LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" # (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}" @@ -316,18 +337,19 @@ LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" # \$LIVE_BINARY_IMAGE: set image type # (Default: ${LIVE_BINARY_IMAGE}) LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" +EOF + +# Creating lh_source_* configuration +cat > "${LIVE_ROOT}"/config/source << EOF +# config/chroot: configuration for lh_source_* + +# \$LIVE_SOURCE: set source option +# (Default: ${LH_SOURCE}) +LIVE_SOURCE="${LIVE_SOURCE}" # \$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 diff --git a/helpers/lh_losetup b/helpers/lh_losetup index 47c8f344f..a8d61766d 100755 --- a/helpers/lh_losetup +++ b/helpers/lh_losetup @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "losetup: Init" diff --git a/helpers/lh_source b/helpers/lh_source index b8892d2e8..a595569f4 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source: Init" @@ -48,7 +49,7 @@ lh_source_generic "${@}" lh_source_hdd "${@}" lh_source_iso "${@}" lh_source_net "${@}" -lh_source_usb "${@}" +lh_source_usb-hdd "${@}" # Deconfiguring chroot rm -f .stage/chroot_sources diff --git a/helpers/lh_source_config b/helpers/lh_source_config index 5b549bedd..2c3db263b 100755 --- a/helpers/lh_source_config +++ b/helpers/lh_source_config @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_config: Init" diff --git a/helpers/lh_source_download b/helpers/lh_source_download index d9f0adfd2..050dc4dbe 100755 --- a/helpers/lh_source_download +++ b/helpers/lh_source_download @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_download: Init" @@ -59,7 +60,7 @@ fi # Download sources Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt -#echo "live-helper" >> chroot/root/dpkg-selection.txt +echo "live-helper" >> chroot/root/dpkg-selection.txt Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only" rm -f chroot/root/dpkg-selection.txt diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic index d3e800954..6bd2a7770 100755 --- a/helpers/lh_source_generic +++ b/helpers/lh_source_generic @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_generic: Init" diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd index 498a18bf2..ac5ff730e 100755 --- a/helpers/lh_source_hdd +++ b/helpers/lh_source_hdd @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_hdd: Init" diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index f69b70571..b00172787 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_iso: Init" diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index e17566362..9569c22aa 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_md5sum: Init" diff --git a/helpers/lh_source_net b/helpers/lh_source_net index 67ed8fa5b..4b63befa1 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults Breakpoint "source_net: Init" diff --git a/helpers/lh_source_usb b/helpers/lh_source_usb deleted file mode 100755 index 91207debf..000000000 --- a/helpers/lh_source_usb +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -# lh_source_usb(1) - build source image -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; 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 - - # Checking depends - Check_package chroot/sbin/mkdosfs dosfstools - Check_package chroot/sbin/parted parted - - # Installing depends - Install_package - - # Remove old source - if [ -f source.img ] - then - rm -f source.img - fi - - # Everything which comes here needs to be cleaned up, - DU_DIM="`du -ms source | cut -f1`" - REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 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 - ${LH_ROOT_COMMAND} mount ${FREELO} source.tmp - cp -r source/* source.tmp - ${LH_ROOT_COMMAND} umount source.tmp - rmdir source.tmp - ${LH_LOSETUP} -d ${FREELO} - echo "!!! The above error/warning messages can be ignored !!!" - - if [ -n "${MAKEDEV}" ] - then - rm -f chroot/dev - mv chroot/dev.tmp chroot/dev - fi - - # Removing depends - Remove_package - - # Creating stage file - Create_stagefile .stage/source_usb - fi -done diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd new file mode 100755 index 000000000..7cc7c2376 --- /dev/null +++ b/helpers/lh_source_usb-hdd @@ -0,0 +1,113 @@ +#!/bin/sh + +# lh_source_usb-hdd(1) - build source image +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; 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/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "source_usb-hdd: Init" + +if [ "${LIVE_SOURCE}" != "enabled" ] +then + exit 0 +fi + +for IMAGE in ${LIVE_SOURCE_IMAGE} +do + if [ "${IMAGE}" = "usb-hdd" ] + then + # Requiring stage file + Require_stagefile .stage/source_download + + # Checking stage file + Check_stagefile .stage/source_usb-hdd + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Checking depends + Check_package chroot/sbin/mkdosfs dosfstools + Check_package chroot/sbin/parted parted + + # Installing depends + Install_package + + # Remove old source + if [ -f source.img ] + then + rm -f source.img + fi + + # Everything which comes here needs to be cleaned up, + DU_DIM="`du -ms source | cut -f1`" + REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 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.vfat -F 16 -n DEBIAN_LIVE ${FREELO}" + mkdir -p source.tmp + ${LH_ROOT_COMMAND} mount ${FREELO} source.tmp + cp -r source/* source.tmp + ${LH_ROOT_COMMAND} umount source.tmp + rmdir source.tmp + ${LH_LOSETUP} -d ${FREELO} + echo "!!! The above error/warning messages can be ignored !!!" + + if [ -n "${MAKEDEV}" ] + then + rm -f chroot/dev + mv chroot/dev.tmp chroot/dev + fi + + # Removing depends + Remove_package + + # Creating stage file + Create_stagefile .stage/source_usb-hdd + fi +done diff --git a/helpers/lh_testroot b/helpers/lh_testroot index bb5592e79..679119ed6 100755 --- a/helpers/lh_testroot +++ b/helpers/lh_testroot @@ -24,6 +24,10 @@ 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_debug "Init ${PROGRAM}" diff --git a/helpers/make-live b/helpers/make-live index 35ae73c38..36546dd18 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -31,7 +31,7 @@ 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] [--root-command sudo]" +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-hdd|net] [-s|--source-image generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior" diff --git a/includes/etch/install/doc/FAQ/html/ch-basic_defs.html b/includes/etch/install/doc/FAQ/html/ch-basic_defs.html deleted file mode 100644 index aac1358c5..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-basic_defs.html +++ /dev/null @@ -1,431 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Definitions and overview - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 1 - Definitions and overview -

- -
- -

1.1 What is this FAQ?

- -

-This document gives frequently asked questions (with their answers!) about the -Debian distribution (Debian GNU/Linux and others) and about the Debian project. -If applicable, pointers to other documentation will be given: we won't quote -large parts of external documentation in this document. You'll find out that -some answers assume some knowledge of Unix-like operating systems. We'll try -to assume as little prior knowledge as possible: answers to general beginners -questions will be kept simple. -

- -

-If you can't find what you're looking for in this FAQ, be sure to check out What other documentation exists on and -for a Debian system?, Section 11.1. If even that doesn't help, refer to Feedback, Section 15.2. -

- -
- -

1.2 What is Debian GNU/Linux?

- -

-Debian GNU/Linux is a particular distribution of the Linux operating -system, and numerous packages that run on it. -

- -

-In principle, users could obtain the Linux kernel via the Internet or from -elsewhere, and compile it themselves. They could then obtain source code for -many applications in the same way, compile the programs, then install them into -their systems. For complicated programs, this process can be not only -time-consuming but error-prone. To avoid it, users often choose to obtain the -operating system and the application packages from one of the Linux -distributors. What distinguishes the various Linux distributors are the -software, protocols, and practices they use for packaging, installing, and -tracking applications packages on users' systems, combined with installation -and maintenance tools, documentation, and other services. -

- -

-Debian GNU/Linux is the result of a volunteer effort to create a free, -high-quality Unix-compatible operating system, complete with a suite of -applications. The idea of a free Unix-like system originates from the GNU -project, and many of the applications that make Debian GNU/Linux so useful were -developed by the GNU project. -

- -

-For Debian, free has the GNUish meaning (see the Debian Free Software -Guidelines). When we speak of free software, we are referring to -freedom, not price. Free software means that you have the freedom to -distribute copies of free software, that you receive source code or can get it -if you want it, that you can change the software or use pieces of it in new -free programs; and that you know you can do these things. -

- -

-The Debian Project was created by Ian Murdock in 1993, initially under the -sponsorship of the Free Software Foundation's GNU project. Today, Debian's -developers think of it as a direct descendent of the GNU project. -

- -

-Debian GNU/Linux is: -

-
    -
  • -

    -full featured: Debian includes more than 18347 software -packages at present. Users can select which packages to install; Debian -provides a tool for this purpose. You can find a list and descriptions of the -packages currently available in Debian at any of the Debian mirror sites. -

    -
    • -
-
    -
  • -

    -free to use and redistribute: There is no consortium -membership or payment required to participate in its distribution and -development. All packages that are formally part of Debian GNU/Linux are free -to redistribute, usually under terms specified by the GNU General Public -License. -

    - -

    -The Debian FTP archives also carry approximately 444 software packages (in the -non-free and contrib sections), which are -distributable under specific terms included with each package. -

    -
    • -
-
    -
  • -

    -dynamic: With about 1950 volunteers constantly contributing -new and improved code, Debian is evolving rapidly. New releases are planned to -be made every several months, and the FTP archives are updated daily. -

    -
    • -
- -

-Although Debian GNU/Linux itself is free software, it is a base upon which -value-added Linux distributions can be built. By providing a reliable, -full-featured base system, Debian provides Linux users with increased -compatibility, and allows Linux distribution creators to eliminate duplication -of effort and focus on the things that make their distribution special. See I am making a special Linux -distribution for a "vertical market". Can I use Debian GNU/Linux for -the guts of a Linux system and add my own applications on top of it?, Section -13.3 for more information. -

- -
- -

1.3 OK, now I know what Debian is... what is Linux?!

- -

-In short, Linux is the kernel of a Unix-like operating system. It was -originally designed for 386 (and better) PCs; today Linux also runs on a dozen -of other systems. Linux is written by Linus Torvalds and many computer -scientists around the world. -

- -

-Besides its kernel, a "Linux" system usually has: -

- -
    -
  • -

    -a wide range of Unix utilities, many of which have been developed by the GNU -project and the Free Software Foundation. -

    -
    • -
- -

-The combination of the Linux kernel, the file system, the GNU and FSF -utilities, and the other utilities are designed to achieve compliance with the -POSIX (IEEE 1003.1) standard; see How -source code compatible is Debian with other Unix systems?, Section 3.3. -

- -

-For more information about Linux, see Michael K. Johnson's Linux Information -Sheet and Meta-FAQ. -

- -
- -

1.4 Does Debian just do GNU/Linux?

- -

-Currently, Debian is only available for Linux, but with Debian GNU/Hurd and -Debian on BSD kernels, we have started to offer non-Linux-based OSes as a -development, server and desktop platform, too. However, these non-linux ports -are not officially released yet. -

- -

-The oldest porting effort is Debian GNU/Hurd. -

- -

-The Hurd is a set of servers running on top of the GNU Mach microkernel. -Together they build the base for the GNU operating system. -

- -

-Please see http://www.gnu.org/software/hurd/ -for more information about the GNU/Hurd in general, and http://www.debian.org/ports/hurd/ -for more information about Debian GNU/Hurd. -

- -

-A second effort is the port to a BSD kernel. People are working with both the -NetBSD and the FreeBSD kernels. -

- -

-See http://www.debian.org/ports/#nonlinux -for more information about these non-linux ports. -

- -
- -

1.5 What is the difference between Debian GNU/Linux and other Linux distributions? Why should I choose Debian over some other distribution?

- -

-These key features distinguish Debian from other Linux distributions: -

-
-
Freedom:
-
-

-As stated in the Debian -Social Contract, Debian will remain 100% free. Debian is very -strict about shipping truly free software. The guidelines used to determine if -a work is "free" are provided in The Debian Free -Software. -

-
-
-
-
The Debian package maintenance system:
-
-

-The entire system, or any individual component of it, can be upgraded in place -without reformatting, without losing custom configuration files, and (in most -cases) without rebooting the system. Most Linux distributions available today -have some kind of package maintenance system; the Debian package maintenance -system is unique and particularly robust (see Basics of the Debian package management system, -Chapter 6). -

-
-
-
-
Open development:
-
-

-Whereas other Linux distributions are developed by individuals, small, closed -groups, or commercial vendors, Debian is the only major Linux distribution that -is being developed cooperatively by many individuals through the Internet, in -the same spirit as Linux and other free software. -

- -

-More than 1950 volunteer package maintainers are working on over 18347 packages -and improving Debian GNU/Linux. The Debian developers contribute to the -project not by writing new applications (in most cases), but by packaging -existing software according to the standards of the project, by communicating -bug reports to upstream developers, and by providing user support. See also -additional information on how to become a contributor in How can I become a Debian software -developer?, Section 12.1. -

-
-
-
-
The Universal Operating System:
-
-

-Debian comes with more than -18347 packages and runs on 10 architectures. This is far -more than is available for any other GNU/Linux distribution. See What types of applications and development -software are available for Debian GNU/Linux?, Section 4.1 for an overview -of the provided software and see On what -hardware architectures/systems does Debian GNU/Linux run?, Section 3.1 for -a description of the supported hardware platforms. -

-
-
-
-
The Bug Tracking System:
-
-

-The geographical dispersion of the Debian developers required sophisticated -tools and quick communication of bugs and bug-fixes to accelerate the -development of the system. Users are encouraged to send bugs in a formal -style, which are quickly accessible by WWW archives or via e-mail. See -additional information in this FAQ on the management of the bug log in Are there logs of known bugs?, Section -11.4. -

-
-
-
-
The Debian Policy:
-
-

-Debian has an extensive specification of our standards of quality, the Debian -Policy. This document defines the qualities and standards to which we hold -Debian packages. -

-
-
- -

-For additional information about this, please see our web page about reasons to choose -Debian. -

- -
- -

1.6 How does the Debian project fit in or compare with the Free Software Foundation's GNU project?

- -

-The Debian system builds on the ideals of free software first championed by the -Free Software Foundation and in -particular by Richard -Stallman. FSF's powerful system development tools, utilities, and -applications are also a key part of the Debian system. -

- -

-The Debian Project is a separate entity from the FSF, however we communicate -regularly and cooperate on various projects. The FSF explicitly requested that -we call our system "Debian GNU/Linux", and we are happy to comply -with that request. -

- -

-The FSF's long-standing objective is to develop a new operating system called -GNU, based on Hurd. Debian is working -with FSF on this system, called Debian GNU/Hurd. -

- -
- -

1.7 How does one pronounce Debian and what does this word mean?

- -

-The project name is pronounced Deb'-ee-en, with a short e in Deb, and emphasis -on the first syllable. This word is a contraction of the names of Debra and -Ian Murdock, who founded the project. (Dictionaries seem to offer some -ambiguity in the pronunciation of Ian (!), but Ian prefers ee'-en.) -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-basic_defs.html b/includes/etch/install/doc/FAQ/html/ch-basic_defs.html new file mode 120000 index 000000000..6bee626aa --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-basic_defs.html @@ -0,0 +1 @@ +ch-basic_defs.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-compat.html b/includes/etch/install/doc/FAQ/html/ch-compat.html deleted file mode 100644 index 4e92270c0..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-compat.html +++ /dev/null @@ -1,386 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Compatibility issues - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 3 - Compatibility issues -

- -
- -

3.1 On what hardware architectures/systems does Debian GNU/Linux run?

- -

-Debian GNU/Linux includes complete source-code for all of the included -programs, so it should work on all systems which are supported by the Linux -kernel; see the Linux -FAQ for details. -

- -

-The current Debian GNU/Linux release, 4.0, contains a complete, binary -distribution for the following architectures: -

- -

-i386: this covers PCs based on Intel and compatible processors, -including Intel's 386, 486, Pentium, Pentium Pro, Pentium II (both Klamath and -Celeron), and Pentium III, and most compatible processors by AMD, Cyrix and -others. -

- -

-m68k: this covers Amigas and ATARIs having a Motorola 680x0 processor -for x>=2; with MMU. -

- -

-alpha: Compaq/Digital's Alpha systems. -

- -

-sparc: this covers Sun's SPARC and most UltraSPARC systems. -

- -

-powerpc: this covers some IBM/Motorola PowerPC machines, including -CHRP, PowerMac and PReP machines. -

- -

-arm: ARM and StrongARM machines. -

- -

-mips: SGI's big-endian MIPS systems, Indy and Indigo2; -mipsel: little-endian MIPS machines, Digital DECstations. -

- -

-hppa: Hewlett-Packard's PA-RISC machines (712, C3000, L2000, A500). -

- -

-ia64: Intel IA-64 ("Itanium") computers. -

- -

-s390: IBM S/390 mainframe systems. -

- -

-The development of binary distributions of Debian for Sparc64 (UltraSPARC -native) architectures is currently underway. -

- -

-For further information on booting, partitioning your drive, enabling PCMCIA -(PC Card) devices and similar issues please follow the instructions given in -the Installation Manual, which is available from our WWW site at http://www.debian.org/releases/stable/installmanual. -

- -
- -

3.2 How compatible is Debian with other distributions of Linux?

- -

-Debian developers communicate with other Linux distribution creators in an -effort to maintain binary compatibility across Linux distributions. Most -commercial Linux products run as well under Debian as they do on the system -upon which they were built. -

- -

-Debian GNU/Linux adheres to the Linux Filesystem Hierarchy -Standard. However, there is room for interpretation in some of the -rules within this standard, so there may be slight differences between a Debian -system and other Linux systems. -

- -

-Debian GNU/Linux supports software developed for the Linux Standard Base. The LSB is a -specification for allowing the same binary package to be used on multiple -distributions. Packages for the Debian Etch release must not conflict with -requirements of the LSB, v1.3. As of this writing, Debian GNU/Linux is not -formally LSB-certified. However, some Debian derived distributions are. -Discussion and coordination of efforts towards ensuring Debian meets the -requirements of the Linux Standard Base is taking place on the debian-lsb mailing list. -

- -
- -

3.3 How source code compatible is Debian with other Unix systems?

- -

-For most applications Linux source code is compatible with other Unix systems. -It supports almost everything that is available in System V Unix systems and -the free and commercial BSD-derived systems. However in the Unix business such -claim has nearly no value because there is no way to prove it. In the software -development area complete compatibility is required instead of compatibility in -"about most" cases. So years ago the need for standards arose, and -nowadays POSIX.1 (IEEE Standard 1003.1-1990) is one of the major standards for -source code compatibility in Unix-like operating systems. -

- -

-Linux is intended to adhere to POSIX.1, but the POSIX standards cost real money -and the POSIX.1 (and FIPS 151-2) certification is quite expensive; this made it -more difficult for the Linux developers to work on complete POSIX conformance. -The certification costs make it unlikely that Debian will get an official -conformance certification even if it completely passed the validation suite. -(The validation suite is now freely available, so it is expected that more -people will work on POSIX.1 issues.) -

- -

-Unifix GmbH (Braunschweig, Germany) developed a Linux system that has been -certified to conform to FIPS 151-2 (a superset of POSIX.1). This technology -was available in Unifix' own distribution called Unifix Linux 2.0 and in -Lasermoon's Linux-FT. -

- -
- -

3.4 Can I use Debian packages (".deb" files) on my Red Hat/Slackware/... Linux system? Can I use Red Hat packages (".rpm" files) on my Debian GNU/Linux system?

- -

-Different Linux distributions use different package formats and different -package management programs. -

-
-
You probably can:
-
-

-A program to unpack a Debian package onto a Linux host that is been built from -a `foreign' distribution is available, and will generally work, in the sense -that files will be unpacked. The converse is probably also true, that is, a -program to unpack a Red Hat or Slackware package on a host that is based on -Debian GNU/Linux will probably succeed in unpacking the package and placing -most files in their intended directories. This is largely a consequence of the -existence (and broad adherence to) the Linux Filesystem Hierarchy Standard. -The Alien package -is used to convert between different package formats. -

-
-
-
-
You probably do not want to:
-
-

-Most package managers write administrative files when they are used to unpack -an archive. These administrative files are generally not standardized. -Therefore, the effect of unpacking a Debian package on a `foreign' host will -have unpredictable (certainly not useful) effects on the package manager on -that system. Likewise, utilities from other distributions might succeed in -unpacking their archives on Debian systems, but will probably cause the Debian -package management system to fail when the time comes to upgrade or remove some -packages, or even simply to report exactly what packages are present on a -system. -

-
-
-
-
A better way:
-
-

-The Linux File System Standard (and therefore Debian GNU/Linux) requires that -subdirectories under /usr/local/ be entirely under the user's -discretion. Therefore, users can unpack `foreign' packages into this -directory, and then manage their configuration, upgrade and removal -individually. -

-
-
- -
- -

3.5 Is Debian able to run my old libc5 programs?

- -

-Yes. Just install the required libc5 libraries, from the -oldlibs section (containing old packages included for -compatibility with older applications). -

- -
- -

3.6 Can Debian be used to compile libc5 programs?

- -

-Yes. Install libc5-altdev and altgcc packages (from -the oldlibs section). You can find the appropriate libc5-compiled -gcc and g++ in directory -/usr/i486-linuxlibc1/bin. Put them in your $PATH variable to get -make and other programs to execute these first. -

- -

-Be aware that libc5 environment isn't fully supported by our other packages -anymore. -

- -
- -

3.7 How should I install a non-Debian program?

- -

-Files under the directory /usr/local/ are not under the control of -the Debian package management system. Therefore, it is good practice to place -the source code for your program in /usr/local/src/. For example, you might -extract the files for a package named "foo.tar" into the directory -/usr/local/src/foo. After you compile them, place the binaries in -/usr/local/bin/, the libraries in /usr/local/lib/, -and the configuration files in /usr/local/etc/. -

- -

-If your programs and/or files really must be placed in some other directory, -you could still store them in /usr/local/, and build the -appropriate symbolic links from the required location to its location in -/usr/local/, e.g., you could make the link -

- -
-     ln -s /usr/local/bin/foo /usr/bin/foo
-
- -

-In any case, if you obtain a package whose copyright allows redistribution, you -should consider making a Debian package of it, and uploading it for the Debian -system. Guidelines for becoming a package developer are included in the Debian -Policy manual (see What other -documentation exists on and for a Debian system?, Section 11.1). -

- -
- -

3.8 Why can't I compile programs that require libtermcap?

- -

-Debian uses the terminfo database and the ncurses -library of terminal interface routes, rather than the termcap -database and the termcap library. Users who are compiling -programs that require some knowledge of the terminal interface should replace -references to libtermcap with references to -libncurses. -

- -

-To support binaries that have already been linked with the termcap -library, and for which you do not have the source, Debian provides a package -called termcap-compat. This provides both -libtermcap.so.2 and /etc/termcap. Install this -package if the program fails to run with the error message "can't load -library 'libtermcap.so.2'", or complains about a missing -/etc/termcap file. -

- -
- -

3.9 Why can't I install AccelX?

- -

-AccelX uses the termcap library for installation. See Why can't I compile programs that require libtermcap?, -Section 3.8 above. -

- -
- -

3.10 Why do my old XFree 2.1 Motif applications crash?

- -

-You need to install the motifnls package, which provides the -XFree-2.1 configuration files needed to allow Motif applications compiled under -XFree-2.1 to run under XFree-3.1. -

- -

-Without these files, some Motif applications compiled on other machines (such -as Netscape) may crash when attempting to copy or paste from or to a text -field, and may also exhibit other problems. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-compat.html b/includes/etch/install/doc/FAQ/html/ch-compat.html new file mode 120000 index 000000000..069644986 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-compat.html @@ -0,0 +1 @@ +ch-compat.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-contributing.html b/includes/etch/install/doc/FAQ/html/ch-contributing.html deleted file mode 100644 index ae790badd..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-contributing.html +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Contributing to the Debian Project - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 12 - Contributing to the Debian Project -

- -
- -

-Donations of time -(to develop new packages, maintain existing packages, or provide user support), -resources (to mirror the FTP and WWW archives), and money (to pay for new -testbeds as well as hardware for the archives) can help the project. -

- -
- -

12.1 How can I become a Debian software developer?

- -

-The development of Debian is open to all, and new users with the right skills -and/or the willingness to learn are needed to maintain existing packages which -have been "orphaned" by their previous maintainers, to develop new -packages, and to provide user support. -

- -

-The description of becoming a Debian developer can be found at the New Maintainer's -Corner at the Debian web site. -

- -
- -

12.2 How can I contribute resources to the Debian project?

- -

-Since the project aims to make a substantial body of software rapidly and -easily accessible throughout the globe, mirrors are urgently needed. It is -desirable but not absolutely necessary to mirror all of the archive. Please -visit the Debian mirror -size page for information on the disk space requirements. -

- -

-Most of the mirroring is accomplished entirely automatically by scripts, -without any interaction. However, the occasional glitch or system change -occurs which requires human intervention. -

- -

-If you have a high-speed connection to the Internet, the resources to mirror -all or part of the distribution, and are willing to take the time (or find -someone) who can provide regular maintenance of the system, then please contact -debian-admin@lists.debian.org. -

- -
- -

12.3 How can I contribute financially to the Debian project?

- -

-One can make individual donations to one of two organizations that are critical -to the development of the Debian project. -

- -
- -

12.3.1 Software in the Public Interest

- -

-Software in the Public Interest (SPI) is an IRS 501(c)(3) non-profit -organization, formed when FSF withdrew their sponsorship of Debian. The -purpose of the organization is to develop and distribute free software. -

- -

-Our goals are very much like those of FSF, and we encourage programmers to use -the GNU General Public License on their programs. However, we have a slightly -different focus in that we are building and distributing a Linux system that -diverges in many technical details from the GNU system planned by FSF. We -still communicate with FSF, and we cooperate in sending them changes to GNU -software and in asking our users to donate to FSF and the GNU project. -

- -

-SPI can be reached at: http://www.spi-inc.org/. -

- -
- -

12.3.2 Free Software Foundation

- -

-At this time there is no formal connection between Debian and the Free Software -Foundation. However, the Free Software Foundation is responsible for some of -the most important software components in Debian, including the GNU C compiler, -GNU Emacs, and much of the C run-time library that is used by all programs on -the system. FSF pioneered much of what free software is today: they wrote the -General Public License that is used on much of the Debian software, and they -invented the "GNU" project to create an entirely free Unix system. -Debian should be considered a descendent of the GNU system. -

- -

-FSF can be reached at: http://www.fsf.org/. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-contributing.html b/includes/etch/install/doc/FAQ/html/ch-contributing.html new file mode 120000 index 000000000..4185524fd --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-contributing.html @@ -0,0 +1 @@ +ch-contributing.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-customizing.html b/includes/etch/install/doc/FAQ/html/ch-customizing.html deleted file mode 100644 index 0185e6ce4..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-customizing.html +++ /dev/null @@ -1,522 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Customizing your installation of Debian GNU/Linux - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 10 - Customizing your installation of Debian GNU/Linux -

- -
- -

10.1 How can I ensure that all programs use the same paper size?

- -

-Install the libpaper1 package, and it will ask you for a -system-wide default paper size. This setting will be kept in the file -/etc/papersize. -

- -

-Users can override the paper size setting using the PAPERSIZE -environment variable. For details, see the manual page -papersize(5). -

- -
- -

10.2 How can I provide access to hardware peripherals, without compromising security?

- -

-Many device files in the /dev directory belong to some predefined -groups. For example, /dev/fd0 belongs to the floppy -group, and /dev/dsp belongs to the audio group. -

- -

-If you want a certain user to have access to one of these devices, just add the -user to the group the device belongs to, i.e. do: -

- -
-     adduser user group
-
- -

-This way you won't have to change the file permissions on the device. -

- -
- -

10.3 How do I load a console font on startup the Debian way?

- -

-The kbd and console-tools packages support this, edit -/etc/kbd/config or /etc/console-tools/config files. -

- -
- -

10.4 How can I configure an X11 program's application defaults?

- -

-Debian's X programs will install their application resource data in the -/etc/X11/app-defaults/ directory. If you want to customize X -applications globally, put your customizations in those files. They are marked -as configuration files, so their contents will be preserved during upgrades. -

- -
- -

10.5 Every distribution seems to have a different boot-up method. Tell me about Debian's.

- -

-Like all Unices, Debian boots up by executing the program init. -The configuration file for init (which is -/etc/inittab) specifies that the first script to be executed -should be /etc/init.d/rcS. This script runs all of the scripts in -/etc/rcS.d/ by sourcing or forking subprocess depending on their -file extension to perform initialization such as to check and to mount file -systems, to load modules, to start the network services, to set the clock, and -to perform other initialization. Then, for compatibility, it runs the files -(except those with a `.'in the filename) in /etc/rc.boot/ too. -Any scripts in the latter directory are usually reserved for system -administrator use, and using them in packages is deprecated. -

- -

-After completing the boot process, init executes all start scripts -in a directory specified by the default runlevel (this runlevel is given by the -entry for id in /etc/inittab). Like most System V -compatible Unices, Linux has 7 runlevels: -

-
    -
  • -

    -0 (halt the system), -

    -
    • -
-
    -
  • -

    -1 (single-user mode), -

    -
    • -
-
    -
  • -

    -2 through 5 (various multi-user modes), and -

    -
    • -
-
    -
  • -

    -6 (reboot the system). -

    -
    • -
- -

-Debian systems come with id=2, which indicates that the default runlevel will -be '2' when the multi-user state is entered, and the scripts in -/etc/rc2.d/ will be run. -

- -

-In fact, the scripts in any of the directories, /etc/rcN.d/ are -just symbolic links back to scripts in /etc/init.d/. However, the -names of the files in each of the /etc/rcN.d/ directories -are selected to indicate the way the scripts in -/etc/init.d/ will be run. Specifically, before entering any -runlevel, all the scripts beginning with 'K' are run; these scripts kill -services. Then all the scripts beginning with 'S' are run; these scripts start -services. The two-digit number following the 'K' or 'S' indicates the order in -which the script is run. Lower numbered scripts are executed first. -

- -

-This approach works because the scripts in /etc/init.d/ all take -an argument which can be either `start', `stop', `reload', `restart' or -`force-reload' and will then do the task indicated by the argument. These -scripts can be used even after a system has been booted, to control various -processes. -

- -

-For example, with the argument `reload' the command -

- -
-     /etc/init.d/sendmail reload
-
- -

-sends the sendmail daemon a signal to reread its configuration file. (BTW, -Debian supplies invoke-rc.d as a wrapper for invoking the scripts -in /etc/init.d/.) -

- -
- -

10.6 It looks as if Debian does not use rc.local to customize the boot process; what facilities are provided?

- -

-Suppose a system needs to execute script foo on start-up, or on -entry to a particular (System V) runlevel. Then the system administrator -should: -

-
    -
  • -

    -Enter the script foo into the directory /etc/init.d/. -

    -
    • -
-
    -
  • -

    -Run the Debian command update-rc.d with appropriate arguments, to -set up links between the (command-line-specified) directories rc?.d and -/etc/init.d/foo. Here, '?' is a number from 0 through 6 and -corresponds to each of the System V runlevels. -

    -
    • -
-
    -
  • -

    -Reboot the system. -

    -
    • -
- -

-The command update-rc.d will set up links between files in the -directories rc?.d and the script in /etc/init.d/. Each link will -begin with a 'S' or a 'K', followed by a number, followed by the name of the -script. Scripts beginning with 'S' in /etc/rcN.d/ are executed -when runlevel N is entered. Scripts beginning with a 'K' are -executed when leaving runlevel N. -

- -

-One might, for example, cause the script foo to execute at -boot-up, by putting it in /etc/init.d/ and installing the links -with update-rc.d foo defaults 19. The argument 'defaults' refers -to the default runlevels, which are 2 through 5. The argument '19' ensures -that foo is called before any scripts containing numbers 20 or -larger. -

- -
- -

10.7 How does the package management system deal with packages that contain configuration files for other packages?

- -

-Some users wish to create, for example, a new server by installing a group of -Debian packages and a locally generated package consisting of configuration -files. This is not generally a good idea, because dpkg will not -know about those configuration files if they are in a different package, and -may write conflicting configurations when one of the initial "group" -of packages is upgraded. -

- -

-Instead, create a local package that modifies the configuration files of the -"group" of Debian packages of interest. Then dpkg and -the rest of the package management system will see that the files have been -modified by the local "sysadmin" and will not try to overwrite them -when those packages are upgraded. -

- -
- -

10.8 How do I override a file installed by a package, so that a different version can be used instead?

- -

-Suppose a sysadmin or local user wishes to use a program -"login-local" rather than the program "login" provided by -the Debian login package. -

- -

-Do not: -

-
    -
  • -

    -Overwrite /bin/login with login-local. -

    -
    • -
- -

-The package management system will not know about this change, and will simply -overwrite your custom /bin/login whenever login (or -any package that provides /bin/login) is installed or updated. -

- -

-Rather, do -

-
    -
  • -

    -Execute: -

    - -
    -     dpkg-divert --divert /bin/login.debian /bin/login
-
    - -

    -in order to cause all future installations of the Debian login -package to write the file /bin/login to -/bin/login.debian instead. -

    -
    • -
-
    -
  • -

    -Then execute: -

    - -
    -     cp login-local /bin/login
-
    - -

    -to move your own locally-built program into place. -

    -
    • -
- -

-Details are given in the manual page dpkg-divert(8). -

- -
- -

10.9 How can I have my locally-built package included in the list of available packages that the package management system knows about?

- -

-Execute the command: -

- -
-     dpkg-scanpackages BIN_DIR OVERRIDE_FILE [PATHPREFIX] > my_Packages
-
- -

-where: -

-
    -
  • -

    -BIN-DIR is a directory where Debian archive files (which usually have an -extension of ".deb") are stored. -

    -
    • -
-
    -
  • -

    -OVERRIDE_FILE is a file that is edited by the distribution maintainers and is -usually stored on a Debian FTP archive at indices/override.main.gz -for the Debian packages in the "main" distribution. You can ignore -this for local packages. -

    -
    • -
-
    -
  • -

    -PATHPREFIX is an optional string that can be prepended to the -my_Packages file being produced. -

    -
    • -
- -

-Once you have built the file my_Packages, tell the package -management system about it by using the command: -

- -
-     dpkg --merge-avail my_Packages
-
- -

-If you are using APT, you can add the local repository to your -sources.list(5) file, too. -

- -
- -

10.10 Some users like mawk, others like gawk; some like vim, others like elvis; some like trn, others like tin; how does Debian support diversity?

- -

-There are several cases where two packages provide two different versions of a -program, both of which provide the same core functionality. Users might prefer -one over another out of habit, or because the user interface of one package is -somehow more pleasing than the interface of another. Other users on the same -system might make a different choice. -

- -

-Debian uses a "virtual" package system to allow system administrators -to choose (or let users choose) their favorite tools when there are two or more -that provide the same basic functionality, yet satisfy package dependency -requirements without specifying a particular package. -

- -

-For example, there might exist two different versions of newsreaders on a -system. The news server package might 'recommend' that there exist -some news reader on the system, but the choice of tin or -trn is left up to the individual user. This is satisfied by -having both the tin and trn packages provide the -virtual package news-reader. Which program is invoked is -determined by a link pointing from a file with the virtual package name -/etc/alternatives/news-reader to the selected file, e.g., -/usr/bin/trn. -

- -

-A single link is insufficient to support full use of an alternate program; -normally, manual pages, and possibly other supporting files must be selected as -well. The Perl script update-alternatives provides a way of -ensuring that all the files associated with a specified package are selected as -a system default. -

- -

-For example, to check what executables provide `x-window-manager', run: -

- -
-     update-alternatives --display x-window-manager
-
- -

-If you want to change it, run: -

- -
-     update-alternatives --config x-window-manager
-
- -

-And follow the instructions on the screen (basically, press the number next to -the entry you'd like better). -

- -

-If a package doesn't register itself as a window manager for some reason (file -a bug if it's in error), or if you use a window manager from /usr/local -directory, the selections on screen won't contain your preferred entry. You -can update the link through command line options, like this: -

- -
-     update-alternatives --install /usr/bin/x-window-manager \
-       x-window-manager /usr/local/bin/wmaker-cvs 50
-
- -

-The first argument to `--install' option is the symlink that points to -/etc/alternatives/NAME, where NAME is the second argument. The third argument -is the program to which /etc/alternatives/NAME should point to, and the fourth -argument is the priority (larger value means the alternative will more probably -get picked automatically). -

- -

-To remove an alternative you added, simply run: -

- -
-     update-alternatives --remove x-window-manager /usr/local/bin/wmaker-cvs
-
- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-customizing.html b/includes/etch/install/doc/FAQ/html/ch-customizing.html new file mode 120000 index 000000000..1cfdfaae7 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-customizing.html @@ -0,0 +1 @@ +ch-customizing.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-faqinfo.html b/includes/etch/install/doc/FAQ/html/ch-faqinfo.html deleted file mode 100644 index 1d4f43b35..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-faqinfo.html +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - General information about the FAQ - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 15 - General information about the FAQ -

- -
- -

15.1 Authors

- -

-The first edition of this FAQ was made and maintained by J.H.M. Dassen (Ray) -and Chuck Stickelman. Authors of the rewritten Debian GNU/Linux FAQ are Susan -G. Kleinmann and Sven Rudolph. After them, the FAQ was maintained by Santiago -Vila and, later, by Josip Rodin. The current maintainer is Javier -Fernandez-Sanguino. -

- -

-Parts of the information came from: -

-
    -
  • -

    -The Debian-1.1 release announcement, by Bruce Perens. -

    -
    • -
- - - -
    -
  • -

    -many developers, volunteers, and beta testers, and -

    -
    • -
-
    -
  • -

    -the flaky memories of its authors. :-) -

    -
    • -
- -

-The authors would like to thank all those who helped make this document -possible. -

- -

-All warranties are disclaimed. All trademarks are property of their respective -trademark owners. -

- -
- -

15.2 Feedback

- -

-Comments and additions to this document are always welcome. Please send e-mail -to doc-debian@packages.debian.org, -or submit a wishlist bug report against the doc-debian package. -

- -
- -

15.3 Availability

- -

-The latest version of this document can be viewed on the Debian WWW pages at -http://www.debian.org/doc/FAQ/. -

- -

-It is also available for download in plain text, HTML, PostScript and PDF -formats at http://www.debian.org/doc/user-manuals#faq. -Also, there are several translations there. -

- -

-The original SGML files used to create this document are also available in -doc-debian's source package, or in CVS at: -:pserver:anonymous@cvs.debian.org:/cvs/debian-doc/ddp/manuals.sgml/faq -

- -
- -

15.4 Document format

- -

-This document was written using the DebianDoc SGML DTD (rewritten from LinuxDoc -SGML). DebianDoc SGML systems enables us to create files in a variety of -formats from one source, e.g. this document can be viewed as HTML, plain text, -TeX DVI, PostScript, PDF, or GNU info. -

- -

-Conversion utilities for DebianDoc SGML are available in Debian package -debiandoc-sgml. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-faqinfo.html b/includes/etch/install/doc/FAQ/html/ch-faqinfo.html new file mode 120000 index 000000000..0f759b493 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-faqinfo.html @@ -0,0 +1 @@ +ch-faqinfo.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-ftparchives.html b/includes/etch/install/doc/FAQ/html/ch-ftparchives.html deleted file mode 100644 index 6560f1407..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-ftparchives.html +++ /dev/null @@ -1,575 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - The Debian FTP archives - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 5 - The Debian FTP archives -

- -
- -

5.1 What are all those directories at the Debian FTP archives?

- -

-The software that has been packaged for Debian GNU/Linux is available in one of -several directory trees on each Debian mirror site. -

- -

-The dists directory is short for "distributions", and it -is the canonical way to access the currently available Debian releases (and -pre-releases). -

- -

-The pool directory contains the actual packages, see What's in the pool directory?, Section 5.10. -

- -

-There are the following supplementary directories: -

-
-
/tools/:
-
-

-DOS utilities for creating boot disks, partitioning your disk drive, -compressing/decompressing files, and booting Linux. -

-
-
-
-
/doc/:
-
-

-The basic Debian documentation, such as the FAQ, the bug reporting system -instructions, etc. -

-
-
-
-
/indices/:
-
-

-The Maintainers file and the override files. -

-
-
-
-
/project/:
-
-

-mostly developer-only materials, such as: -

-
-
project/experimental/:
-
-

-This directory contains packages and tools which are still being developed, and -are still in the alpha testing stage. Users shouldn't be using packages from -here, because they can be dangerous and harmful even for the most experienced -people. -

-
-
-
-
- -
- -

5.2 How many Debian distributions are there in the dists directory?

- -

-There are three distributions, the "stable" distribution, the -"testing" distribution, and the "unstable" distribution. -The "testing" distribution is sometimes `frozen' (see What about "testing"? How is it `frozen'?, Section -5.6.1). -

- -
- -

5.3 What are all those names like slink, potato, etc.?

- -

-They are just "codenames". When a Debian distribution is in the -development stage, it has no version number but a codename. The purpose of -these codenames is to make easier the mirroring of the Debian distributions (if -a real directory like unstable suddenly changed its name to -stable, a lot of stuff would have to be needlessly downloaded -again). -

- -

-Currently, stable is a symbolic link to etch (i.e. -Debian GNU/Linux 4.0) and testing is a symbolic link to -lenny. This means that etch is the current stable -distribution and lenny is the current testing distribution. -

- -

-unstable is a permanent symbolic link to sid, as -sid is always the unstable distribution (see What -about "sid"?, Section 5.4). -

- -
- -

5.3.1 Which other codenames have been used in the past?

- -

-Other codenames that have been already used are: buzz for release -1.1, rex for release 1.2, bo for releases 1.3.x, -hamm for release 2.0, slink for release 2.1, -potato for release 2.2, woody for release 3.0 and -sarge for release 3.1. -

- -
- -

5.3.2 Where do these codenames come from?

- -

-So far they have been characters taken from the movie "Toy Story" by -Pixar. -

-
    -
  • -

    -buzz (Buzz Lightyear) was the spaceman, -

    -
    • -
-
    -
  • -

    -rex was the tyrannosaurus, -

    -
    • -
-
    -
  • -

    -bo (Bo Peep) was the girl who took care of the sheep, -

    -
    • -
-
    -
  • -

    -hamm was the piggy bank, -

    -
    • -
-
    -
  • -

    -slink (Slinky Dog (R)) was the toy dog, -

    -
    • -
-
    -
  • -

    -potato was, of course, Mr. Potato (R), -

    -
    • -
-
    -
  • -

    -woody was the cowboy, -

    -
    • -
-
    -
  • -

    -sarge was the sergeant of the Green Plastic Army Men, -

    -
    • -
-
    -
  • -

    -etch was the toy blackboard (Etch-a-Sketch (R)), -

    -
    • -
-
    -
  • -

    -lenny was the binoculars. -

    -
    • -
-
    -
  • -

    -sid was the boy next door who destroyed toys. -

    -
    • -
- -
- -

5.4 What about "sid"?

- -

-sid or unstable is the place where most of the packages are -initially uploaded. It will never be released directly, because packages which -are to be released will first have to be included in testing, in order -to be released in stable later on. sid contains packages for both -released and unreleased architectures. -

- -

-The name "sid" also comes from the "Toy Story" animated -motion picture: Sid was the boy next door who destroyed toys :-) -

- -

-[1] -

- -
- -

5.5 What does the stable directory contain?

-
    -
  • -

    -stable/main/: This directory contains the packages which formally constitute -the most recent release of the Debian GNU/Linux system. -

    - -

    -These packages all comply with the Debian Free Software -Guidelines, and are all freely usable and distributable. -

    -
    • -
-
    -
  • -

    -stable/non-free/: This directory contains packages distribution of which is -restricted in a way that requires that distributors take careful account of the -specified copyright requirements. -

    - -

    -For example, some packages have licenses which prohibit commercial -distribution. Others can be redistributed but are in fact shareware and not -freeware. The licenses of each of these packages must be studied, and possibly -negotiated, before the packages are included in any redistribution (e.g., in a -CD-ROM). -

    -
    • -
-
    -
  • -

    -stable/contrib/: This directory contains packages which are DFSG-free and -freely distributable themselves, but somehow depend on a package that -is not freely distributable and thus available only in the non-free -section. -

    -
    • -
- -
- -

5.6 What does the testing directory contain?

- -

-Packages are installed into the `testing' directory after they have undergone -some degree of testing in unstable. -

- -

-They must be in sync on all architectures where they have been built and -mustn't have dependencies that make them uninstallable; they also have to have -fewer release-critical bugs than the versions currently in testing. This way, -we hope that `testing' is always close to being a release candidate. -

- -

-More information about the status of "testing" in general and the -individual packages is available at http://www.debian.org/devel/testing -

- -
- -

5.6.1 What about "testing"? How is it `frozen'?

- -

-When the "testing" distribution is mature enough, the release manager -starts `freezing' it. The normal propagation delays are increased to ensure -that as little as possible new bugs from "unstable" enter -"testing". -

- -

-After a while, the "testing" distribution becomes truly `frozen'. -This means that all new packages that are to propagate to the -"testing" are held back, unless they include release-critical bug -fixes. The "testing" distribution can also remain in such a deep -freeze during the so-called `test cycles', when the release is imminent. -

- -

-We keep a record of bugs in the "testing" distribution that can hold -off a package from being released, or bugs that can hold back the whole -release. For details, please see current testing release -information. -

- -

-Once that bug count lowers to maximum acceptable values, the frozen -"testing" distribution is declared "stable" and released -with a version number. -

- -

-With each new release, the previous "stable" distribution becomes -obsolete and moves to the archive. For more information please see Debian archive. -

- -
- -

5.7 What does the unstable directory contain?

- -

-The `unstable' directory contains a snapshot of the current development system. -Users are welcome to use and test these packages, but are warned about their -state of readiness. The advantage of using the unstable distribution is that -you are always up-to-date with the latest in GNU/Linux software industry, but -if it breaks: you get to keep both parts :-) -

- -

-There are also main, contrib and non-free subdirectories in `unstable', -separated on the same criteria as in `stable'. -

- -
- -

5.8 What are all those directories inside dists/stable/main?

- -

-Within each of the major directory trees[2], there are three sets of subdirectories containing index -files. -

- -

-There's one set of binary-something subdirectories -which contain index files for binary packages of each available computer -architecture, for example binary-i386 for packages which execute -on Intel x86 PC machines or binary-sparc for packages which -execute on Sun SPARCStations. -

- -

-The complete list of available architectures for each release is available at -the release's web -page. For the current release, please see On what hardware architectures/systems does -Debian GNU/Linux run?, Section 3.1. -

- -

-The index files in binary-* are called Packages(.gz) and they include a summary -of each binary package that is included in that distribution. The actual -binary packages (for woody and subsequent releases) reside in the top -level pool directory. -

- -

-Furthermore, there's a subdirectory called source/ which contains index files -for source packages included in the distribution. The index file is called -Sources(.gz). -

- -

-Last but not least, there's a set of subdirectories meant for the installation -system index files. In the woody release, these are named -disks-architecture; in sarge, they are at -debian-installer/binary-architecture. -

- -
- -

5.9 Where is the source code?

- -

-Source code is included for everything in the Debian system. Moreover, the -license terms of most programs in the system require that source code -be distributed along with the programs, or that an offer to provide the source -code accompany the programs. -

- -

-The source code is distributed in the pool directory (see What's in the pool directory?, Section 5.10) -together with all the architecture-specific binary directories. To retrieve -the source code without having to be familiar with the structure of the FTP -archive, try a command like apt-get source mypackagename. -

- -

-Some packages are only distributed as source code due to the restrictions in -their licenses. Notably, one such package is pine, see Where is pine?, Section 4.10 for more -information. -

- -

-Source code may or may not be available for packages in the "contrib" -and "non-free" directories, which are not formally part of the Debian -system. -

- -
- -

5.10 What's in the pool directory?

- -

-Packages are kept in a large `pool', structured according to the name of the -source package. To make this manageable, the pool is subdivided by section -(`main', `contrib' and `non-free') and by the first letter of the source -package name. These directories contain several files: the binary packages for -each architecture, and the source packages from which the binary packages were -generated. -

- -

-You can find out where each package is placed by executing a command like -apt-cache showsrc mypackagename and looking at the `Directory:' -line. For example, the apache packages are stored in -pool/main/a/apache/. -

- -

-Additionally, since there are so many lib* packages, these are -treated specially: for instance, libpaper packages are stored in -pool/main/libp/libpaper/. -

- -

-[3] -

- -
- -

5.11 What is "incoming"?

- -

-After a developer uploads a package, it stays for a short while in the -"incoming" directory before it is checked that it's genuine and -allowed into the archive. -

- -

-Usually nobody should install things from this place. However, in some rare -cases of emergency, the incoming directory is available at http://incoming.debian.org/. You -can manually fetch packages, check the GPG signature and MD5sums in the -.changes and .dsc files, and then install them. -

- -
- -

5.12 How do I set up my own apt-able repository?

- -

-If you have built some private Debian packages which you'd like to install -using the standard Debian package management tools, you can set up your own -apt-able package archive. This is also useful if you'd like to share your -Debian packages while these are not distributed by the Debian project. -Instructions on how to do this are given in the Debian -Repository HOWTO. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-ftparchives.html b/includes/etch/install/doc/FAQ/html/ch-ftparchives.html new file mode 120000 index 000000000..cdad69f63 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-ftparchives.html @@ -0,0 +1 @@ +ch-ftparchives.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-getting.html b/includes/etch/install/doc/FAQ/html/ch-getting.html deleted file mode 100644 index fe19d0836..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-getting.html +++ /dev/null @@ -1,374 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Getting and installing Debian GNU/Linux - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 2 - Getting and installing Debian GNU/Linux -

- -
- -

-The official document giving installation instructions is the Debian GNU/Linux -Installation Guide. We'll give some additional notes about getting -and installing Debian GNU/Linux here. -

- -
- -

2.1 What is the latest version of Debian?

- -

-Currently there are three versions of Debian GNU/Linux: -

-
-
release 4.0, a.k.a. the `stable' distribution
-
-

-This is stable and well tested software, it changes if major security or -usability fixes are incorporated. -

-
-
-
-
the `testing' distribution
-
-

-This is where packages that will be released as the next `stable' are placed; -they've had some testing in unstable but they may not be completely fit for -release yet. This distribution is updated more often than `stable', but not -more often than `unstable'. -

-
-
-
-
the `unstable' distribution
-
-

-This is the version currently under development; it is updated continuously. -You can retrieve packages from the `unstable' archive on any Debian FTP site -and use them to upgrade your system at any time, but you may not expect the -system to be as usable or as stable as before - that's why it's called -`unstable'! -

-
-
- -

-Please see How many Debian -distributions are there in the dists directory?, Section 5.2 -for more information. -

- -
- -

2.2 Are there package upgrades in `stable'?

- -

-No new functionality is added to the stable release. Once a Debian version is -released and tagged `stable' it will only get security updates. That is, only -packages for which a security vulnerability has been found after the release -will be upgraded. All the security updates are served through security.debian.org. -

- -

-Security updates serve one purpose: to supply a fix for a security -vulnerability. They are not a method for sneaking additional changes into the -stable release without going through normal point release procedure. -Consequently, fixes for packages with security issues will not upgrade the -software. The Debian Security Team will backport the necessary fixes to the -version of the software distributed in `stable' instead. -

- -

-For more information related to security support please read the Security FAQ or the -Debian -Security Manual. -

- -
- -

2.3 Where/how can I get the Debian installation disks?

- -

-You can get the installation disks by downloading the appropriate files from -one of the Debian -mirrors. -

- -

-The installation system files are separated in subdirectories of -dists/stable/main directory, and the names of these subdirectories -correspond to your architecture like this: disks-arch -(arch is "i386", "sparc", etc, check the site -for an exact list). In each of these architecture subdirectories there can be -several directories, each for a version of the installation system, and the -currently used one is in the `current' directory (that's a symbolic link). -

- -

-See the README.txt file in that directory for further -instructions. -

- -
- -

2.4 How do I install the Debian from CD-ROMs?

- -

-Linux supports the ISO 9660 (CD-ROM) file system with Rock Ridge extensions -(formerly known as "High Sierra"). Several vendors provide Debian -GNU/Linux in this format. -

- -

-Warning: When installing from CD-ROM, it is usually not a good idea to choose -dselect's cdrom access method. This method is usually very slow. -The mountable and apt methods, for example, are much -better for installing from CD-ROM (see dpkg-mountable, Section 8.2.5 -and apt-get, dselect and apt-cdrom, Section -8.2.2). -

- -
- -

2.5 Why does the official stable released CD-ROM contain symlinks for `frozen' and `unstable'? I thought this CD contains just `stable'!

- -

-Official Debian CD images indeed contain symlinks like: -

- -
-      /dists/frozen -> sarge/
-      /dists/stable -> sarge/
-      /dists/testing -> sarge/
-      /dists/unstable -> sarge/
-
- -

-so that they work when your sources.list has an entry like -

- -
-      deb cdrom:[<name as on cd label>]/ unstable main [...]
-
- -

-. -

- -

-The fact these symlinks are present does not mean the image is -`unstable' or `testing' or anything. Read the CD label in -/.disk/info to find out which Debian version it contains. This -information is also present in /README.txt on the CD. -

- -

-Read http://www.debian.org/releases/ -to find out what the current `stable' and `testing' releases are. -

- -
- -

2.6 I have my own CD-writer, are there CD images available somewhere?

- -

-Yes. To make it easier for CD vendors to provide high quality disks, we -provide the Official CD -images. -

- -
- -

2.7 Can I install it from a pile of floppy disks?

- -

-First of all, a warning: whole Debian GNU/Linux is way too large to be -installed from media as small as a standard 1.44MB floppy disk - you may not -find installing from floppies a very pleasant experience. -

- -

-Copy the Debian packages onto formatted floppy disks. Either a DOS, the native -Linux "ext2", or the "minix" format will do; one just has -to use a mount command appropriate to the floppy being used. -

- -

-Using floppy disks has these complications: -

-
    -
  • -

    -Short MS-DOS file names: If you are trying to place Debian package files onto -MS-DOS formatted disks, you will find that their names are generally too long, -and do not conform to the MS-DOS 8.3 filename limitation. To overcome this, -you would have to use VFAT formatted disks, since VFAT supports longer file -names. -

    -
    • -
-
    -
  • -

    -Large file sizes: Some packages are larger than 1.44 MBytes, and will not fit -onto a single floppy disk. To solve this problem, use the dpkg-split tool (see -dpkg-split, Section 7.1.5.2), -available in the tools directory on Debian mirrors. -

    -
    • -
- -

-You must have support in the kernel for floppy disks in order to read and write -to floppy disk; most kernels come with floppy drive support included in them. -

- -

-To mount a floppy disk under the mount point /floppy (a directory -which should have been created during installation), use: -

-
    -
  • -
    -     mount -t msdos /dev/fd0 /floppy/
-
    - -

    -if the floppy disk is in drive A: and has an MS-DOS file system, -

    -
    • -
-
    -
  • -
    -     mount -t msdos /dev/fd1 /floppy/
-
    - -

    -if the floppy disk is in drive B: and has an MS-DOS file system, -

    -
    • -
-
    -
  • -
    -     mount -t ext2 /dev/fd0 /floppy/
-
    - -

    -if the floppy disk is in drive A: and has an ext2 (i.e., a normal Linux) file -system. -

    -
    • -
- -
- -

2.8 Can I get and install Debian directly from a remote Internet site?

- -

-Yes. You can boot the Debian installation system from a set of files you can -download from our FTP site and its mirrors. -

- -

-You can download a small CD image file, create a bootable CD from it, install -the basic system from it and the rest over the network. For more information -please see http://www.debian.org/CD/netinst/. -

- -

-You can also download even smaller floppy disk image files, create bootable -diskettes from them, start the installation procedure and get the rest of -Debian over the network. For more information, please see http://www.debian.org/distrib/floppyinst. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-getting.html b/includes/etch/install/doc/FAQ/html/ch-getting.html new file mode 120000 index 000000000..568d808b9 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-getting.html @@ -0,0 +1 @@ +ch-getting.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-kernel.html b/includes/etch/install/doc/FAQ/html/ch-kernel.html deleted file mode 100644 index 28e150f5c..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-kernel.html +++ /dev/null @@ -1,315 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Debian and the kernel - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 9 - Debian and the kernel -

- -
- -

9.1 Can I install and compile a kernel without some Debian-specific tweaking?

- -

-Yes. -

- -

-There's only one common catch: the Debian C libraries are built with the most -recent stable releases of the kernel headers. If you -happen to need to compile a program with kernel headers newer than the ones -from the stable branch, then you should either upgrade the package containing -the headers (libc6-dev), or use the new headers from an unpacked -tree of the newer kernel. That is, if the kernel sources are in -/usr/src/linux, then you should add --I/usr/src/linux/include/ to your command line when compiling. -

- -
- -

9.2 What tools does Debian provide to build custom kernels?

- -

-Users who wish to (or must) build a custom kernel are encouraged to download -the package kernel-package. This package contains the script to -build the kernel package, and provides the capability to create a Debian -kernel-image-version package just by running the -command -

- -
-     make-kpkg kernel_image
-
- -

-in the top-level kernel source directory. Help is available by executing the -command -

- -
-     make-kpkg --help
-
- -

-and through the manual page make-kpkg(1). -

- -

-Users must separately download the source code for the most recent kernel (or -the kernel of their choice) from their favorite Linux archive site, unless a -kernel-source-version package is available (where -version stands for the kernel version). -

- -

-Detailed instructions for using the kernel-package package are -given in the file /usr/share/doc/kernel-package/README.gz. -Briefly, one should: -

-
    -
  • -

    -Unpack the kernel sources, and cd to the newly created directory. -

    -
    • -
-
    -
  • -

    -Modify the kernel configuration using one of these commands: -

    -
      -
    • -

      -make config (for a text-based interface). -

      -
      • -
    -
      -
    • -

      -make menuconfig (for an ncurses-based menu driven interface). -Note that to use this option, the libncurses5-dev package must be -installed. -

      -
      • -
    -
      -
    • -

      -make xconfig (for an X11 interface). Using this option requires -that relevant X and Tcl/Tk packages be installed. -

      -
      • -
    - -

    -Any of the above steps generates a new .config in the top-level -kernel source directory. -

    -
    • -
-
    -
  • -

    -Execute the command: make-kpkg -rev Custom.N -kernel_image, where N is a revision number assigned by the -user. The new Debian archive thus formed would have revision -Custom.N, e.g. kernel-image-2.2.14_Custom.1_i386.deb -for the Linux kernel 2.2.14 on i386. -

    -
    • -
-
    -
  • -

    -Install the package created. -

    -
      -
    • -

      -Run dpkg --install -../kernel-image-VVV_Custom.N_i386.deb to install -the kernel itself. The installation script will: -

      -
        -
      • -

        -run the boot loader (grub, LILO or some other) if needed, -

        -
        • -
      -
        -
      • -

        -install the custom kernel in -/boot/vmlinuz_VVV-Custom.N, and set up -appropriate symbolic links to the most recent kernel version. -

        -
        • -
      - -
      • -
    -
      -
    • -

      -To employ secondary boot loaders such as loadlin, copy this image -to other locations (e.g. to an MS-DOS partition). -

      -
      • -
    -
    • -
- -
- -

9.3 How can I make a custom boot floppy?

- -

-This task is greatly aided by the Debian package boot-floppies, -normally found in the admin section of the Debian FTP archive. -Shell scripts in this package produce boot floppies in the -SYSLINUX format. These are MS-DOS formatted floppies -whose master boot records have been altered so that they boot Linux directly -(or whatever other operating system has been defined in the -syslinux.cfg file on the floppy). Other scripts in this package -produce emergency root disks and can even reproduce the base disks. -

- -

-You will find more information about this in the -/usr/share/doc/boot-floppies/README file after installing the -boot-floppies package. -

- -
- -

9.4 What special provisions does Debian provide to deal with modules?

- -

-Debian's modconf package provides a shell script -(/usr/sbin/modconf) which can be used to customize the -configuration of modules. This script presents a menu-based interface, -prompting the user for particulars on the loadable device drivers in his -system. The responses are used to customize the file -/etc/modules.conf (which lists aliases, and other arguments that -must be used in conjunction with various modules) through files in -/etc/modutils/, and /etc/modules (which lists the -modules that must be loaded at boot time). -

- -

-Like the (new) Configure.help files that are now available to -support the construction of custom kernels, the modconf package -comes with a series of help files (in /usr/lib/modules_help/) -which provide detailed information on appropriate arguments for each of the -modules. -

- -
- -

9.5 Can I safely de-install an old kernel package, and if so, how?

- -

-Yes. The kernel-image-NNN.prerm script checks to see -whether the kernel you are currently running is the same as the kernel you are -trying to de-install. Therefore you can remove unwanted kernel image packages -using this command: -

- -
-     dpkg --purge --force-remove-essential kernel-image-NNN
-
- -

-(replace NNN with your kernel version and revision number, of -course) -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-kernel.html b/includes/etch/install/doc/FAQ/html/ch-kernel.html new file mode 120000 index 000000000..125039fb4 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-kernel.html @@ -0,0 +1 @@ +ch-kernel.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-nexttime.html b/includes/etch/install/doc/FAQ/html/ch-nexttime.html deleted file mode 100644 index 2df0e3f73..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-nexttime.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Changes expected in the next major release of Debian - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 14 - Changes expected in the next major release of Debian -

- -
- -

14.1 Increased security

- -

-Debian contains support for shadow passwords since release 1.3. In addition, -the Linux library of Pluggable Authentication Modules (a.k.a. libpam;) that -allows sysadmins to choose authorization modes on an application-specific basis -is available, and initially set to authenticate via shadow password. -

- -

-Including full support for additional security enhancements for mandatory -access control mechanisms such as SElinux, RSBAC and buffer overflow protection -like Exec-shield or PaX is still in progress. -

- -
- -

14.2 Extended support for non-English users

- -

-Debian already has very good support for non-English users, see How does Debian support non-English -languages?, Section 4.8. -

- -

-We hope to find people who will provide support for even more languages, and -translate. Some programs already support internationalization, so we need -message catalogs translators. Many programs still remain to be properly -internationalized. -

- -

-The GNU Translation Project ftp://ftp.gnu.org/pub/gnu/ABOUT-NLS -works on internationalizing the GNU programs. -

- -
- -

14.3 More architectures

- -

-Complete Debian system on other architectures such as AMD64 or SuperH is -expected soon. Notice that even though some architectures are dropped for a -given the release there still might be a way to install and upgrade using the -latest sid. -

- -
- -

14.4 More kernels

- -

-In addition to Debian GNU/Hurd, Debian is being ported also to BSD kernels, -namely to NetBSD. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-nexttime.html b/includes/etch/install/doc/FAQ/html/ch-nexttime.html new file mode 120000 index 000000000..da23d4849 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-nexttime.html @@ -0,0 +1 @@ +ch-nexttime.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html deleted file mode 100644 index a26e8ee17..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html +++ /dev/null @@ -1,863 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Basics of the Debian package management system - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 6 - Basics of the Debian package management system -

- -
- -

6.1 What is a Debian package?

- -

-Packages generally contain all of the files necessary to implement a set of -related commands or features. There are two types of Debian packages: -

-
    -
  • -

    -Binary packages, which contain executables, configuration files, -man/info pages, copyright information, and other documentation. These packages -are distributed in a Debian-specific archive format (see What is the format of a Debian binary package?, Section -6.2); they are usually distinguished by having a '.deb' file extension. -Binary packages can be unpacked using the Debian utility dpkg; -details are given in its manual page. -

    -
    • -
-
    -
  • -

    -Source packages, which consist of a .dsc file describing -the source package (including the names of the following files), a -.orig.tar.gz file that contains the original unmodified source in -gzip-compressed tar format and usually a .diff.gz file that -contains the Debian-specific changes to the original source. The utility -dpkg-source packs and unpacks Debian source archives; details are -provided in its manual page. -

    -
    • -
- -

-Installation of software by the package system uses "dependencies" -which are carefully designed by the package maintainers. These dependencies -are documented in the control file associated with each package. -For example, the package containing the GNU C compiler (gcc) -"depends" on the package binutils which includes the -linker and assembler. If a user attempts to install gcc without -having first installed binutils, the package management system -(dpkg) will send an error message that it also needs binutils, and -stop installing gcc. (However, this facility can be overridden by -the insistent user, see dpkg(8).) See more in What is meant by saying that a package Depends, -Recommends, Suggests, Conflicts, Replaces -or Provides another package?, Section 6.9 below. -

- -

-Debian's packaging tools can be used to: -

-
    -
  • -

    -manipulate and manage packages or parts of packages, -

    -
    • -
-
    -
  • -

    -aid the user in the break-up of packages that must be transmitted through a -limited-size medium such as floppy disks, -

    -
    • -
-
    -
  • -

    -aid developers in the construction of package archives, and -

    -
    • -
-
    -
  • -

    -aid users in the installation of packages which reside on a remote FTP site. -

    -
    • -
- -
- -

6.2 What is the format of a Debian binary package?

- -

-A Debian "package", or a Debian archive file, contains the executable -files, libraries, and documentation associated with a particular suite of -program or set of related programs. Normally, a Debian archive file has a -filename that ends in .deb. -

- -

-The internals of this Debian binary packages format are described in the -deb(5) manual page. This internal format is subject to change -(between major releases of Debian GNU/Linux), therefore please always use -dpkg-deb(1) for manipulating .deb files. -

- -
- -

6.3 Why are Debian package file names so long?

- -

-The Debian binary package file names conform to the following convention: -<foo>_<VersionNumber>-<DebianRevisionNumber>.deb -

- -

-Note that foo is supposed to be the package name. As a check, one -can learn the package name associated with a particular Debian archive file -(.deb file) in one of these ways: -

-
    -
  • -

    -inspect the "Packages" file in the directory where it was stored at a -Debian FTP archive site. This file contains a stanza describing each package; -the first field in each stanza is the formal package name. -

    -
    • -
-
    -
  • -

    -use the command dpkg --info foo_VVV-RRR.deb (where VVV and RRR are -the version and revision of the package in question, respectively). This -displays, among other things, the package name corresponding to the archive -file being unpacked. -

    -
    • -
- -

-The VVV component is the version number specified by the upstream -developer. There are no standards in place here, so the version number may -have formats as different as "19990513" and "1.3.8pre1". -

- -

-The RRR component is the Debian revision number, and is specified -by the Debian developer (or an individual user if he chooses to build the -package himself). This number corresponds to the revision level of the Debian -package, thus, a new revision level usually signifies changes in the Debian -Makefile (debian/rules), the Debian control file -(debian/control), the installation or removal scripts -(debian/p*), or in the configuration files used with the package. -

- -
- -

6.4 What is a Debian control file?

- -

-Specifics regarding the contents of a Debian control file are provided in the -Debian Policy Manual, section 5, see What other documentation exists on and -for a Debian system?, Section 11.1. -

- -

-Briefly, a sample control file is shown below for the Debian package hello: -

- -
-     Package: hello
-     Priority: optional
-     Section: devel
-     Installed-Size: 45
-     Maintainer: Adam Heath <doogie@debian.org>
-     Architecture: i386
-     Version: 1.3-16
-     Depends: libc6 (>= 2.1)
-     Description: The classic greeting, and a good example
-      The GNU hello program produces a familiar, friendly greeting.  It
-      allows nonprogrammers to use a classic computer science tool which
-      would otherwise be unavailable to them.
-      .
-      Seriously, though: this is an example of how to do a Debian package.
-      It is the Debian version of the GNU Project's `hello world' program
-      (which is itself an example for the GNU Project).
-
- -

-The Package field gives the package name. This is the name by which the -package can be manipulated by the package tools, and usually similar to but not -necessarily the same as the first component string in the Debian archive file -name. -

- -

-The Version field gives both the upstream developer's version number and (in -the last component) the revision level of the Debian package of this program as -explained in Why are Debian package file names so long?, -Section 6.3. -

- -

-The Architecture field specifies the chip for which this particular binary was -compiled. -

- -

-The Depends field gives a list of packages that have to be installed in order -to install this package successfully. -

- -

-The Installed-Size indicates how much disk space the installed package will -consume. This is intended to be used by installation front-ends in order to -show whether there is enough disk space available to install the program. -

- -

-The Section line gives the "section" where this Debian package is -stored at the Debian FTP sites. This is the name of a subdirectory (within one -of the main directories, see What -are all those directories at the Debian FTP archives?, Section 5.1) where -the package is stored. -

- -

-The Priority indicates how important is this package for installation, so that -semi-intelligent software like dselect or console-apt can sort the package into -a category of e.g. packages optionally installed. See What is an Essential Required, -Important, Standard, Optional, or Extra -package?, Section 6.7. -

- -

-The Maintainer field gives the e-mail address of the person who is currently -responsible for maintaining this package. -

- -

-The Description field gives a brief summary of the package's features. -

- -

-For more information about all possible fields a package can have, please see -the Debian Policy Manual, section 5., "Control files and their -fields". -

- -
- -

6.5 What is a Debian conffile?

- -

-Conffiles is a list of configuration files (usually placed in -/etc) that the package management system will not overwrite when -the package is upgraded. This ensures that local values for the contents of -these files will be preserved, and is a critical feature enabling the in-place -upgrade of packages on a running system. -

- -

-To determine exactly which files are preserved during an upgrade, run: -

- -
-     dpkg --status package
-
- -

-And look under "Conffiles:". -

- -
- -

6.6 What is a Debian preinst, postinst, prerm, and postrm script?

- -

-These files are executable scripts which are automatically run before or after -a package is installed. Along with a file named control, all of -these files are part of the "control" section of a Debian archive -file. -

- -

-The individual files are: -

-
-
preinst
-
-

-This script executes before that package will be unpacked from its Debian -archive (".deb") file. Many 'preinst' scripts stop services for -packages which are being upgraded until their installation or upgrade is -completed (following the successful execution of the 'postinst' script). -

-
-
-
-
postinst
-
-

-This script typically completes any required configuration of the package -foo once foo has been unpacked from its Debian -archive (".deb") file. Often, 'postinst' scripts ask the user for -input, and/or warn the user that if he accepts default values, he should -remember to go back and re-configure that package as the situation warrants. -Many 'postinst' scripts then execute any commands necessary to start or restart -a service once a new package has been installed or upgraded. -

-
-
-
-
prerm
-
-

-This script typically stops any daemons which are associated with a package. -It is executed before the removal of files associated with the package. -

-
-
-
-
postrm
-
-

-This script typically modifies links or other files associated with -foo, and/or removes files created by the package. (Also see What is a Virtual Package?, Section 6.8.) -

-
-
- -

-Currently all of the control files can be found in directory -/var/lib/dpkg/info. The files relevant to package -foo begin with the name "foo" and have file extensions -of "preinst", "postinst", etc., as appropriate. The file -foo.list in that directory lists all of the files that were -installed with the package foo. (Note that the location of these -files is a dpkg internal; you should not rely on it.) -

- -
- -

6.7 What is an Essential Required, Important, Standard, Optional, or Extra package?

- -

-Each Debian package is assigned a priority by the distribution -maintainers, as an aid to the package management system. The priorities are: -

-
    -
  • -

    -Required: packages that are necessary for the proper -functioning of the system. -

    - -

    -This includes all tools that are necessary to repair system defects. You must -not remove these packages or your system may become totally broken and you may -probably not even be able to use dpkg to put things back. Systems with only -the Required packages are probably unusable, but they do have enough -functionality to allow the sysadmin to boot and install more software. -

    -
    • -
-
    -
  • -

    -Important packages should be found on any Unix-like system. -

    - -

    -Other packages which the system will not run well or be usable without will be -here. This does NOT include Emacs or X11 or TeX or any other large -applications. These packages only constitute the bare infrastructure. -

    -
    • -
-
    -
  • -

    -Standard packages are standard on any Linux system, including -a reasonably small but not too limited character-mode system. Tools are -included to be able to browse the web (using w3m), send e-mail (with mutt) and -download files from FTP servers. -

    - -

    -This is what will install by default if users do not select anything else. It -does not include many large applications, but it does include the Python -interpreter and some server software like OpenSSH (for remote administration), -Exim (for mail delivery, although it can be configured for local delivery -only), an identd server (pidentd) and the RPC portmapper -(portmap). It also includes some common generic documentation -that most users will find helpful. -

    -
    • -
-
    -
  • -

    -Optional packages include all those that you might reasonably -want to install if you did not know what it was, or do not have specialized -requirements. -

    - -

    -This includes X11, a full TeX distribution, and lots of applications. -

    -
    • -
-
    -
  • -

    -Extra: packages that either conflict with others with higher -priorities, are only likely to be useful if you already know what they are, or -have specialized requirements that make them unsuitable for -"Optional". -

    -
    • -
- -

-If you do a default Debian installation all the packages of priority -Standard or higher will be installed in your system. If you -select pre-defined tasks you will get lower priority packages too. -

- -

-Additionally, some packages are marked as Essential since they -are absolutely necessary for the proper functioning of the system. The package -management tools will refuse to remove these. -

- -
- -

6.8 What is a Virtual Package?

- -

-A virtual package is a generic name that applies to any one of a group of -packages, all of which provide similar basic functionality. For example, both -the tin and trn programs are news readers, and should -therefore satisfy any dependency of a program that required a news reader on a -system, in order to work or to be useful. They are therefore both said to -provide the "virtual package" called news-reader. -

- -

-Similarly, smail and sendmail both provide the -functionality of a mail transport agent. They are therefore said to provide -the virtual package, "mail transport agent". If either one is -installed, then any program depending on the installation of a -mail-transport-agent will be satisfied by the existence of this -virtual package. -

- -

-Debian provides a mechanism so that, if more than one package which provide the -same virtual package is installed on a system, then system administrators can -set one as the preferred package. The relevant command is -update-alternatives, and is described further in Some users like mawk, others like gawk; -some like vim, others like elvis; some like trn, others like tin; how does -Debian support diversity?, Section 10.10. -

- -
- -

6.9 What is meant by saying that a package Depends, Recommends, Suggests, Conflicts, Replaces or Provides another package?

- -

-The Debian package system has a range of package "dependencies" which -are designed to indicate (in a single flag) the level at which Program A can -operate independently of the existence of Program B on a given system: -

-
    -
  • -

    -Package A depends on Package B if B absolutely must be installed in -order to run A. In some cases, A depends not only on B, but on a version of B. -In this case, the version dependency is usually a lower limit, in the sense -that A depends on any version of B more recent than some specified version. -

    -
    • -
-
    -
  • -

    -Package A recommends Package B, if the package maintainer judges that -most users would not want A without also having the functionality provided by -B. -

    -
    • -
-
    -
  • -

    -Package A suggests Package B if B contains files that are related to -(and usually enhance) the functionality of A. -

    -
    • -
-
    -
  • -

    -Package A conflicts with Package B when A will not operate if B is -installed on the system. Most often, conflicts are cases where A contains -files which are an improvement over those in B. "Conflicts" are -often combined with "replaces". -

    -
    • -
-
    -
  • -

    -Package A replaces Package B when files installed by B are removed and -(in some cases) over-written by files in A. -

    -
    • -
-
    -
  • -

    -Package A provides Package B when all of the files and functionality -of B are incorporated into A. This mechanism provides a way for users with -constrained disk space to get only that part of package A which they really -need. -

    -
    • -
- -

-More detailed information on the use of each these terms can be found in the -Policy manual. -

- -
- -

6.10 What is meant by Pre-Depends?

- -

-"Pre-Depends" is a special dependency. In the case of most packages, -dpkg will unpack its archive file (i.e., its .deb -file) independently of whether or not the files on which it depends exist on -the system. Simplistically, unpacking means that dpkg will -extract the files from the archive file that were meant to be installed on your -file system, and put them in place. If those packages depend on the -existence of some other packages on your system, dpkg will refuse -to complete the installation (by executing its "configure" action) -until the other packages are installed. -

- -

-However, for some packages, dpkg will refuse even to unpack them -until certain dependencies are resolved. Such packages are said to -"Pre-depend" on the presence of some other packages. The Debian -project provided this mechanism to support the safe upgrading of systems from -a.out format to ELF format, where the order -in which packages were unpacked was critical. There are other large upgrade -situations where this method is useful, e.g. the packages with the required -priority and their LibC dependency. -

- -

-As before, more detailed information about this can be found in the Policy -manual. -

- -
- -

6.11 What is meant by unknown, install, remove purge and hold in the package status?

- -

-These "want" flags tell what the user wanted to do with a package (as -indicated either by the user's actions in the "Select" section of -dselect, or by the user's direct invocations of -dpkg). -

- -

-Their meanings are: -

-
    -
  • -

    -unknown - the user has never indicated whether he wants the package -

    -
    • -
-
    -
  • -

    -install - the user wants the package installed or upgraded -

    -
    • -
-
    -
  • -

    -remove - the user wants the package removed, but does not want to remove any -existing configuration files. -

    -
    • -
-
    -
  • -

    -purge - the user wants the package to be removed completely, including its -configuration files. -

    -
    • -
-
    -
  • -

    -hold - the user wants this package not to be processed, i.e., he wants to keep -the current version with the current status whatever that is. -

    -
    • -
- -
- -

6.12 How do I put a package on hold?

- -

-There are three ways of holding back packages, with dpkg, aptitude or with -dselect. -

- -

-With dpkg, you just have to export the list of package selections, with: -

- -
-     dpkg --get-selections \* > selections.txt
-
- -

-Then edit the resulting file selections.txt, change the line -containing the package you wish to hold, e.g. libc6, from this: -

- -
-     libc6                                           install
-
- -

-to this: -

- -
-     libc6                                           hold
-
- -

-Save the file, and reload it into dpkg database with: -

- -
-     dpkg --set-selections < selections.txt
-
- -

-With aptitude, you can hold a package using -

- -
-     aptitude hold package_name
-
- -

-and remove the hold with -

- -
-     aptitude unhold package_name
-
- -

-With dselect, you just have to enter the [S]elect screen, find the package you -wish to hold in its present state, and press the `=' key (or `H'). The changes -will go live immediately after you exit the [S]elect screen. -

- -
- -

6.13 How do I install a source package?

- -

-Debian source packages can't actually be "installed", they are just -unpacked in whatever directory you want to build the binary packages they -produce. -

- -

-Source packages are distributed on most of the same mirrors where you can -obtain the binary packages. If you set up your APT's -sources.list(5) to include the appropriate "deb-src" -lines, you'll be able to easily download any source packages by running -

- -
-     apt-get source foo
-
- -

-To help you in actually building the source package, Debian source package -provide the so-called build-dependencies mechanism. This means that the source -package maintainer keeps a list of other packages that are required to build -their package. To see how this is useful, run -

- -
-     apt-get build-dep foo
-
- -

-before building the source. -

- -
- -

6.14 How do I build binary packages from a source package?

- -

-You will need all of foo_*.dsc, foo_*.tar.gz and foo_*.diff.gz to compile the -source (note: there is no .diff.gz for some packages that are native to -Debian). -

- -

-Once you have them (How do I install a source package?, -Section 6.13), if you have the dpkg-dev package installed, the -following command: -

- -
-     dpkg-source -x foo_version-revision.dsc
-
- -

-will extract the package into a directory called foo-version. -

- -

-If you want just to compile the package, you may cd into -foo-version directory and issue the command -

- -
-     dpkg-buildpackage -rfakeroot -b
-
- -

-to build the package (note that this also requires the fakeroot -package), and then -

- -
-     dpkg -i ../foo_version-revision_arch.deb
-
- -

-to install the newly-built package(s). -

- -
- -

6.15 How do I create Debian packages myself?

- -

-For more detailed description on this, read the New Maintainers' Guide, -available in the maint-guide package, or at http://www.debian.org/doc/devel-manuals#maint-guide. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html new file mode 120000 index 000000000..98c97fece --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html @@ -0,0 +1 @@ +ch-pkg_basics.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-pkgtools.html b/includes/etch/install/doc/FAQ/html/ch-pkgtools.html deleted file mode 100644 index 2183ae950..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-pkgtools.html +++ /dev/null @@ -1,936 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - The Debian package management tools - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 7 - The Debian package management tools -

- -
- -

7.1 What programs does Debian provide for managing its packages?

- -

-There are multiple tools that are used to manage Debian packages, from graphic -or text-based interfaces to the low level tools used to install packages. All -the available tools rely on the lower level tools to properly work and are -presented here in decreasing complexity level. -

- -

-It is important to understand that the higher level package management tools -such as aptitude or dselect rely on apt -which, itself, relies on dpkg to manage the packages in the -system. -

- -

-See the APT -HOWTO for more information about the Debian package management -utilities. This document is available in various languages and formats, see -the APT HOWTO -entry on the DDP Users' Manuals overview. -

- -
- -

7.1.1 dpkg

- -

-This is the main package management program. dpkg can be invoked -with many options. Some common uses are: -

-
    -
  • -

    -Find out all the options: dpkg --help. -

    -
    • -
-
    -
  • -

    -Print out the control file (and other information) for a specified package: -dpkg --info foo_VVV-RRR.deb -

    -
    • -
-
    -
  • -

    -Install a package (including unpacking and configuring) onto the file system of -the hard disk: dpkg --install foo_VVV-RRR.deb. -

    -
    • -
-
    -
  • -

    -Unpack (but do not configure) a Debian archive into the file system of the hard -disk: dpkg --unpack foo_VVV-RRR.deb. Note that this operation -does not necessarily leave the package in a usable state; some files -may need further customization to run properly. This command removes any -already-installed version of the program and runs the preinst (see What is a Debian preinst, postinst, -prerm, and postrm script?, Section 6.6) script associated with the package. -

    -
    • -
-
    -
  • -

    -Configure a package that already has been unpacked: dpkg --configure -foo. Among other things, this action runs the postinst (see What is a Debian preinst, postinst, -prerm, and postrm script?, Section 6.6) script associated with the package. -It also updates the files listed in the conffiles for this -package. Notice that the 'configure' operation takes as its argument a package -name (e.g., foo), not the name of a Debian archive file (e.g., -foo_VVV-RRR.deb). -

    -
    • -
-
    -
  • -

    -Extract a single file named "blurf" (or a group of files named -"blurf*" from a Debian archive: dpkg --fsys-tarfile -foo_VVV-RRR.deb | tar -xf - blurf* -

    -
    • -
-
    -
  • -

    -Remove a package (but not its configuration files): dpkg --remove -foo. -

    -
    • -
-
    -
  • -

    -Remove a package (including its configuration files): dpkg --purge -foo. -

    -
    • -
-
    -
  • -

    -List the installation status of packages containing the string (or regular -expression) "foo*": dpkg --list 'foo*'. -

    -
    • -
- -
- -

7.1.2 APT

- -

-APT is the Advanced Package Tool and provides the apt-get -program. apt-get provides a simple way to retrieve and install -packages from multiple sources using the command line. Unlike -dpkg, apt-get does not understand .deb files, it -works with the packages proper name and can only install .deb archives from a -source specified in /etc/apt/sources.list. apt-get -will call dpkg directly after downloading the .deb archives[4] from the configured sources. -

- -

-Some common ways to use apt-get are: -

-
    -
  • -

    -To update the list of package known by your system, you can run: -

    - -
    -     apt-get update
-
    - -

    -(you should execute this regularly to update your package lists) -

    -
    • -
-
    -
  • -

    -To upgrade all the packages on your system, run: -

    - -
    -     apt-get upgrade
-
    -
    • -
-
    -
  • -

    -To install the foo package and all its dependencies, run: -

    - -
    -     apt-get install foo
-
    -
    • -
-
    -
  • -

    -To remove the foo package from your system, run: -

    - -
    -     apt-get remove foo
-
    -
    • -
-
    -
  • -

    -To remove the foo package and its configuration files from your system, run: -

    - -
    -     apt-get --purge remove foo
-
    -
    • -
-
    -
  • -

    -To upgrade all the packages on your system to a new Debian GNU/Linux release, -run: -

    - -
    -     apt-get dist-upgrade
-
    -
    • -
- -

-Note that you must be logged in as root to perform any commands that modify the -system packages. -

- -

-The apt tool suite also includes the apt-cache tool to query the -package lists. You can use it to find packages providing specific -functionality through simple text or regular expression queries and through -queries of dependencies in the package management system. Some common ways to -use apt-cache are: -

-
    -
  • -

    -To find packages whose description contain word: -

    - -
    -     apt-cache search word
-
    -
    • -
-
    -
  • -

    -To print the detailed information of a package: -

    - -
    -     apt-cache show package
-
    -
    • -
-
    -
  • -

    -To print the packages a given package depends on: -

    - -
    -     apt-cache depends package
-
    -
    • -
-
    -
  • -

    -To print detailed information of the versions available for a package and the -packages that reverse-depends on it: -

    - -
    -     apt-cache showpkg package
-
    -
    • -
- -

-For more information, install the apt package and read -apt-get(8), sources.list(5) and install the -apt-doc package and read -/usr/share/doc/apt-doc/guide.html/index.html. -

- -
- -

7.1.3 aptitude

- -

-aptitude is a package manager for Debian GNU/Linux systems that -provides a frontend to the apt package management infrastructure. -aptitude is a text-based interface using the curses library, it -can be used to perform management tasks in a fast and easy way. -

- -

-aptitude provides the functionality of dselect and -apt-get, as well as many additional features not found in either -program: -

-
    -
  • -

    -aptitude offers access to all versions of a package. -

    -
    • -
-
    -
  • -

    -aptitude logs all its actions in /var/log/aptitude. -

    -
    • -
-
    -
  • -

    -aptitude makes it easy to keep track of obsolete software by -listing it under "Obsolete and Locally Created Packages". -

    -
    • -
-
    -
  • -

    -aptitude includes a fairly powerful system for searching -particular packages and limiting the package display. Users familiar with -mutt will pick up quickly, as mutt was the -inspiration for the expression syntax. -

    -
    • -
-
    -
  • -

    -aptitude tracks which packages have been installed due to -dependencies and removes them automatically when the packages that needed them -are removed from the system. -

    -
    • -
-
    -
  • -

    -aptitude can automatically install Recommended: -packages[5]. -

    -
    • -
-
    -
  • -

    -aptitude in full screen mode has su functionality -embedded and can be run by a normal user. It will call su (and -ask for the root password, if any) when you really need administrative -privileges -

    -
    • -
- -

-You can use aptitude through a visual interface (simply run -aptitude) or directly from the command line. The command line -syntax used is very similar to the one used in apt-get. For -example, to install the foo package, you can run aptitude -install foo. -

- -

-Note that aptitude is the recommended program by Debian to install -a package and/or to upgrade your system. -

- -

-For more informations, read the manual page aptitude(8) and -install the aptitude-doc-en package. -

- -
- -

7.1.4 dselect

- -

-This program is a menu-driven interface to the Debian package management -system. It is particularly useful for first-time installations. Some users -might feel more comfortable using aptitude which is also -recommended over dselect for large-scale upgrades. For more -information on aptitude please see aptitude, -Section 7.1.3. -

- -

-dselect can: -

-
    -
  • -

    -guide the user as he/she chooses among packages to install or remove, ensuring -that no packages are installed that conflict with one another, and that all -packages required to make each package work properly are installed; -

    -
    • -
-
    -
  • -

    -warn the user about inconsistencies or incompatibilities in their selections; -

    -
    • -
-
    -
  • -

    -determine the order in which the packages must be installed; -

    -
    • -
-
    -
  • -

    -automatically perform the installation or removal; and -

    -
    • -
-
    -
  • -

    -guide the user through whatever configuration process are required for each -package. -

    -
    • -
- -

-dselect begins by presenting the user with a menu of 7 items, each -of which is a specific action. The user can select one of the actions by using -the arrow keys to move the highlighter bar, then pressing the -<enter> key to select the highlighted action. -

- -

-What the user sees next depends on the action he selected. If he selects any -option but Access or Select, then -dselect will simply proceed to execute the specified action: e.g., -if the user selected the action Remove, then dselect would proceed -to remove all of the files selected for removal when the user last chose the -Select action. -

- -

-Both the Access menu item and the Select menu item -lead to additional menus. In both cases, the menus are presented as split -screens; the top screen gives a scrollable list of choices, while the bottom -screen gives a brief explanation ("info") for each choice. -

- -

-Extensive on-line help is available, use the '?' key to get to a help screen -at any time. -

- -

-The order in which the actions are presented in the first dselect -menu represents the order in which a user would normally choose -dselect to install packages. However, a user can pick any of the -main menu choices as often as needed (including not at all, depending on what -one wants to do). -

-
    -
  • -

    -Begin by choosing an Access Method. This is the method by -which the user plans on accessing Debian packages; e.g., some users have Debian -packages available on CD-ROM, while others plan to fetch them using anonymous -FTP. The selected "Access Method" is stored after -dselect exits, so if it does not change, then this option need not -be invoked again. -

    -
    • -
-
    -
  • -

    -Then Update the list of available packages. To do this, -dselect reads the file "Packages.gz" which should be -included in the top level of the directory where the Debian packages to be -installed are stored. (But if it is not there, dselect will offer -to make it for you.) -

    -
    • -
-
    -
  • -

    -Select specific packages for installation on his system. -After choosing this menu item, the user is first presented with a full screen -of help (unless the `--expert' command line option was used). Once the user -exits the Help screen, he sees the split-screen menu for choosing packages to -install (or remove). -

    - -

    -The top part of the screen is a relatively narrow window into the list of -Debian's 18347 packages; the bottom part of the screen contains description of -the package or group of packages which are highlighted above. -

    - -

    -One can specify which packages should be operated on by highlighting a package -name or the label for a group of packages. After that, you can select -packages: -

    -
    -
    to be installed:
    -
    -

    -This is accomplished by pressing the `+' key. -

    -
    -
    -
    -
    to be deleted:
    -
    -

    -Packages can be deleted two ways: -

    -
      -
    • -

      -removed: this removes most of the files associated with the package, but -preserves the files listed as configuration files (see What is a Debian conffile?, Section -6.5) and package configuration information. This is done by pressing the -`-' key. -

      -
      • -
    -
      -
    • -

      -purged: this removes every file that is part of the package. This is -done by pressing the `_' key. -

      -
      • -
    - -

    -Note that it's not possible to remove "All Packages". If you try -that, your system will instead be reduced to the initial installed base -packages. -

    -
    -
    -
    -
    to be put "on hold"
    -
    -

    -This is done by pressing `=', and it effectively tells dselect not -to upgrade a package even if the version currently installed on your system is -not as recent as the version that is available in the Debian repository you are -using (this was specified when you set the Access Method, and -acquired when you used Update). -

    - -

    -Just like you can put a package on hold, you can reverse such setting by -pressing `:'. That tells dselect that the package(s) may be -upgraded if a newer version is available. This is the default setting. -

    -
    -
    - -

    -You can select a different order in which the packages are presented, by using -the `o' key to cycle between various options for sorting the packages. The -default order is to present packages by Priority; within each priority, -packages are presented in order of the directory (a.k.a. section) of the -archive in which they are stored. Given this sort order, some packages in -section A (say) may be presented first, followed by some packages in section B, -followed by more packages (of lower priority) in section A. -

    - -

    -You can also expand meanings of the labels at the top of the screen, by using -the `v' (verbose) key. This action pushes much of the text that formerly fit -onto the display off to the right. To see it, press the right arrow; to scroll -back to the left, press the left arrow. -

    - -

    -If you select a package for installation or removal, e.g., -foo.deb, and that package depends on (or recommends) another -package, e.g., blurf.deb, then dselect will place the -you in a sub-screen of the main selection screen. There you can choose among -the related packages, accepting the suggested actions (to install or not), or -rejecting them. To do the latter, press Shift-D; to return to the former, -press Shift-U. In any case, you can save your selections and return to the -main selection screen by pressing Shift-Q. -

    -
    • -
-
    -
  • -

    -Users returning to the main menu can then select the "Install" menu -item to unpack and configure the selected packages. Alternatively, users -wishing to remove files can choose the "Remove" menu item. At any -point, users can choose "Quit" to exit dselect; users' selections are -preserved by dselect. -

    -
    • -
- -
- -

7.1.5 Other package management tools

- -
- -

7.1.5.1 dpkg-deb

- -

-This program manipulates Debian archive(.deb) files. Some common -uses are: -

-
    -
  • -

    -Find out all the options: dpkg-deb --help. -

    -
    • -
-
    -
  • -

    -Determine what files are contained in a Debian archive file: dpkg-deb ---contents foo_VVV-RRR.deb) -

    -
    • -
-
    -
  • -

    -Extract the files contained in a named Debian archive into a user specified -directory: dpkg-deb --extract foo_VVV-RRR.deb tmp extracts each of -the files in foo_VVV-RRR.deb into the directory tmp/. -This is convenient for examining the contents of a package in a localized -directory, without installing the package into the root file system. -

    -
    • -
- -

-Note that any packages that were merely unpacked using dpkg-deb ---extract will be incorrectly installed, you should use dpkg ---install instead. -

- -

-More information is given in the manual page dpkg-deb(1). -

- -
- -

7.1.5.2 dpkg-split

- -

-This program splits large package into smaller files (e.g., for writing onto a -set of floppy disks), and can also be used to merge a set of split files back -into a single file. It can only be used on a Debian system (i.e. a system -containing the dpkg package), since it calls the program -dpkg-deb to parse the debian package file into its component -records. -

- -

-For example, to split a big .deb file into N parts, -

-
    -
  • -

    -Execute the command dpkg-split --split foo.deb. This will produce -N files each of approximately 460 KBytes long in the current directory. -

    -
    • -
-
    -
  • -

    -Copy those N files to floppy disks. -

    -
    • -
-
    -
  • -

    -Copy the contents of the floppy disks onto the hard disk of your choice on the -other machine. -

    -
    • -
-
    -
  • -

    -Join those part-files together using dpkg-split --join -"foo*". -

    -
    • -
- -
- -

7.2 Debian claims to be able to update a running program; how is this accomplished?

- -

-The kernel (file system) in Debian GNU/Linux systems supports replacing files -even while they're being used. -

- -

-We also provide a program called start-stop-daemon which is used -to start daemons at boot time or to stop daemons when the kernel runlevel is -changed (e.g., from multi-user to single-user or to halt). The same program is -used by installation scripts when a new package containing a daemon is -installed, to stop running daemons, and restart them as necessary. -

- -
- -

7.3 How can I tell what packages are already installed on a Debian system?

- -

-To learn the status of all the packages installed on a Debian system, execute -the command -

- -
-     dpkg --list
-
- -

-This prints out a one-line summary for each package, giving a 2-letter status -symbol (explained in the header), the package name, the version which is -installed, and a brief description. -

- -

-To learn the status of packages whose names match the string any pattern -beginning with "foo" by executing the command: -

- -
-     dpkg --list 'foo*'
-
- -

-To get a more verbose report for a particular package, execute the command: -

- -
-     dpkg --status packagename
-
- -
- -

7.4 How can I find out what package produced a particular file?

- -

-To identify the package that produced the file named foo execute -either: -

-
    -
  • -

    -dpkg --search filename -

    - -

    -This searches for filename in installed packages. (This is -(currently) equivalent to searching all of the files having the file extension -of .list in the directory /var/lib/dpkg/info/, and -adjusting the output to print the names of all the packages containing it, and -diversions.) -

    - -

    -A faster alternative to this is the dlocate tool. -

    -
    • -
-
    -
  • -

    -zgrep foo Contents-ARCH.gz -

    - -

    -This searches for files which contain the substring foo in their -full path names. The files Contents-ARCH.gz (where ARCH -represents the wanted architecture) reside in the major package directories -(main, non-free, contrib) at a Debian FTP site (i.e. under -/debian/dists/etch). A Contents file refers only to -the packages in the subdirectory tree where it resides. Therefore, a user -might have to search more than one Contents files to find the -package containing the file foo. -

    - -

    -This method has the advantage over dpkg --search in that it will -find files in packages that are not currently installed on your system. -

    -
    • -
-
    -
  • -

    -apt-file search foo -

    - -

    -Similar to the above, it searches files which contain the substring or regular -expression foo in their full path names. The advantage over the -sample above is that there is no need to retrieve the -Contents-ARCH.gz files as it will do this automatically for all -the sources defined in /etc/apt/sources.list when you run (as -root) apt-file update. -

    -
    • -
- -
- -

7.5 Why doesn't get `foo-data' removed when I uninstall `foo'? How do I make sure old unused library-packages get purged?

- -

-Some packages that are split in program (`foo') and data (`foo-data'). This is -true for many games, multimedia applications and dictionaries in Debian and has -been introduced since some users might want to access the raw data without -installing the program or because the program can be run without the data -itself, making it optional. -

- -

-Similar situations occur when dealing with libraries: generally these get -installed since packages containing applications depend on them. When the -application-package is purged, the library-package might stay on the system. -Or: when the application-package no longer depends upon e.g. libdb4.2, but -upon libdb4.3, the libdb4.2 package might stay when the application-package is -upgraded. -

- -

-In these cases, `foo-data' doesn't depend on `foo', so when you remove the -`foo' package it will not get automatically removed by most package management -tools. The same holds true for the library packages. This is necessary to -avoid circular dependencies. If you use aptitude (see aptitude, Section 7.1.3) as your package management tool -it will, however, track automatically installed packages and remove them when -no packages remain that need them in your system. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-pkgtools.html b/includes/etch/install/doc/FAQ/html/ch-pkgtools.html new file mode 120000 index 000000000..6c9eeed19 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-pkgtools.html @@ -0,0 +1 @@ +ch-pkgtools.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-redistrib.html b/includes/etch/install/doc/FAQ/html/ch-redistrib.html deleted file mode 100644 index 8242553b6..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-redistrib.html +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Redistributing Debian GNU/Linux in a commercial product - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 13 - Redistributing Debian GNU/Linux in a commercial product -

- -
- -

13.1 Can I make and sell Debian CDs?

- -

-Go ahead. You do not need permission to distribute anything we have -released, so that you can master your CD as soon as the beta-test -ends. You do not have to pay us anything. Of course, all CD manufacturers -must honor the licenses of the programs in Debian. For example, many of the -programs are licensed under the GPL, which requires you to distribute their -source code. -

- -

-Also, we will publish a list of CD manufacturers who donate money, software, -and time to the Debian project, and we will encourage users to buy from -manufacturers who donate, so it is good advertising to make donations. -

- -
- -

13.2 Can Debian be packaged with non-free software?

- -

-Yes. While all the main components of Debian are free software, we provide a -non-free directory for programs that are not freely redistributable. -

- -

-CD manufacturers may be able to distribute the programs we have placed -in that directory, depending on the license terms or their private arrangements -with the authors of those software packages. CD manufacturers can also -distribute the non-free software they get from other sources on the same CD. -This is nothing new: free and commercial software are distributed on the same -CD by many manufacturers now. Of course we still encourage software authors to -release the programs they write as free software. -

- -
- -

13.3 I am making a special Linux distribution for a "vertical market". Can I use Debian GNU/Linux for the guts of a Linux system and add my own applications on top of it?

- -

-Yes. Debian-derived distributions are being created both in close cooperation -with the Debian project itself and by external parties. One can use the -Custom Debian -Distributions framework to work together with Debian; Skolelinux is one such project. -

- -

-One person is building a "Linux for Hams" distribution, with -specialized programs for Radio Amateurs. He is starting with Debian as the -"base system", and adding programs to control the transmitter, track -satellites, etc. All of the programs he adds are packaged with the Debian -packaging system so that his users will be able to upgrade easily when he -releases subsequent CDs. -

- -

-There are several other Debian-derived distributions already on the market, -such as Progeny Debian, Linspire, Knoppix and Ubuntu, that are targeted at a -different kind of audience than the original Debian GNU/Linux is, but use most -of our components in their product. -

- -

-Debian also provides a mechanism to allow developers and system administrators -to install local versions of selected files in such a way that they will not be -overwritten when other packages are upgraded. This is discussed further in the -question on How do I override a file -installed by a package, so that a different version can be used instead?, -Section 10.8. -

- -
- -

13.4 Can I put my commercial program in a Debian "package" so that it installs effortlessly on any Debian system?

- -

-Go right ahead. The package tool is free software; the packages may or may not -be free software, it can install them all. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-redistrib.html b/includes/etch/install/doc/FAQ/html/ch-redistrib.html new file mode 120000 index 000000000..f1826236b --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-redistrib.html @@ -0,0 +1 @@ +ch-redistrib.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-software.html b/includes/etch/install/doc/FAQ/html/ch-software.html deleted file mode 100644 index afb823b5d..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-software.html +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Software available in the Debian system - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 4 - Software available in the Debian system -

- -
- -

4.1 What types of applications and development software are available for Debian GNU/Linux?

- -

-Like most Linux distributions, Debian GNU/Linux provides: -

-
    -
  • -

    -the major GNU applications for software development, file manipulation, and -text processing, including gcc, g++, make, texinfo, Emacs, the Bash shell and -numerous upgraded Unix utilities, -

    -
    • -
-
    -
  • -

    -Perl, Python, Tcl/Tk and various related programs, modules and libraries for -each of them, -

    -
    • -
-
    -
  • -

    -TeX (LaTeX) and Lyx, dvips, Ghostscript, -

    -
    • -
-
    -
  • -

    -the X Window System, which provides a networked graphical user interface for -Linux, and countless X applications including GNOME and KDE as well as the GIMP -GNU Image Manipulation Program, -

    -
    • -
-
    -
  • -

    -a full suite of networking applications, including servers for Internet -protocols such as HTTP (WWW), FTP, NNTP (news), SMTP and POP (mail) and name -server; relational databases like PostgreSQL, MySQL; also provided are web -browsers including the various Mozilla producs, -

    -
    • -
-
    -
  • -

    -a complete set of office applications, including the OpenOffice.org -productivity suite, Gnumeric and other spreadsheets, WYSIWYG editors, -calendars. -

    -
    • -
- -

-More than 18138 packages, ranging from news servers and readers to sound -support, FAX programs, database and spreadsheet programs, image processing -programs, communications, net, and mail utilities, Web servers, and even -ham-radio programs are included in the distribution. Another 444 software -suites are available as Debian packages, but are not formally part of Debian -due to license restrictions. -

- -
- -

4.2 Who wrote all that software?

- -

-For each package the authors of the program(s) are credited in the -file /usr/share/doc/PACKAGE/copyright, where PACKAGE is to be -substituted with the package's name. -

- -

-Maintainers who package this software for the Debian GNU/Linux system -are listed in the Debian control file (see What is a Debian control file?, -Section 6.4) that comes with each package. The Debian changelog, in -/usr/share/doc/PACKAGE/changelog.Debian.gz, mentions the people -who've worked on the Debian packaging too. -

- -
- -

4.3 How can I get a current list of programs that have been packaged for Debian?

- -

-A complete list is available from any of the Debian mirrors, in the -file indices/Maintainers. That file includes the package names -and the names and e-mails of their respective maintainers. -

- -

-The WWW interface to the Debian -packages conveniently summarizes the packages in each of about -twenty "sections" of the Debian archive. -

- -
- -

4.4 What is missing from Debian GNU/Linux?

- -

-A list of packages which are still needed to be packaged for Debian exists, the -Work-Needing and Prospective -Packages list. -

- -

-For more details about adding the missing things, see How can I become a Debian software -developer?, Section 12.1. -

- -
- -

4.5 Why do I get "ld: cannot find -lfoo" messages when compiling programs? Why aren't there any libfoo.so files in Debian library packages?

- -

-Debian Policy requires that such symbolic links (to libfoo.so.x.y.z or similar) -are placed in separate, development packages. Those packages are usually named -libfoo-dev or libfooX-dev (presuming the library package is named libfooX, and -X is a whole number). -

- -
- -

4.6 (How) Does Debian support Java?

- -

-Several free implementations of Java technology are available as -Debian packages, providing both Java Development Kits as well as Runtime -Environments. You can write, debug and run Java programs using Debian. -

- -

-Running a Java applet requires a web browser with the capability to recognize -and execute them. Several web browsers available in Debian, such as Mozilla or -Konqueror, support Java plug-ins that enable running Java applets within them. -

- -

-Please refer to the Debian Java -FAQ for more information. -

- -
- -

4.7 How can I check that I am using a Debian system, and what version is it?

- -

-In order to make sure that your system has been installed from the real Debian -base disks check for the existence of /etc/debian_version file, -which contains a single one-line entry giving the version number of the -release, as defined by the package base-files. -

- -

-The existence of the program dpkg shows that you should be able to -install Debian packages on your system, but as the program has been ported to -many other operating systems and architectures, this is no longer a reliable -method of determining is a system Debian GNU/Linux. -

- -

-Users should be aware, however, that the Debian system consists of many parts, -each of which can be updated (almost) independently. Each Debian -"release" contains well defined and unchanging contents. Updates are -separately available. For a one-line description of the installation status of -package foo, use the command dpkg --list foo. To -view versions of all installed packages, run: -

- -
-     dpkg -l
-
- -

-For a more verbose description, use: -

- -
-     dpkg --status foo
-
- -
- -

4.8 How does Debian support non-English languages?

-
    -
  • -

    -Debian GNU/Linux is distributed with keymaps for nearly two dozen keyboards, -and with utilities (in the kbd package) to install, view, and -modify the tables. -

    - -

    -The installation prompts the user to specify the keyboard he will use. -

    -
    • -
-
    -
  • -

    -Vast majority of the software we packaged supports entering non-US-ASCII -characters used in other Latin languages (e.g. ISO-8859-1 or ISO-8859-2), and -a number of programs support multi-byte languages such as Japanese or Chinese. -

    -
    • -
-
    -
  • -

    -Currently, support for German-, Spanish-, Finnish-, French-, Hungarian-, -Italian-, Japanese-, Korean- and Polish-language manual pages is provided -through the manpages-LANG packages (where LANG is the two-letter -ISO country code). To access an NLS manual page, the user must set the shell -LC_MESSAGES variable to the appropriate string. -

    - -

    -For example, in the case of the Italian-language manual pages, LC_MESSAGES -needs to be set to 'italian'. The man program will then search -for Italian manual pages under /usr/share/man/it/. -

    -
    • -
- -
- -

4.9 What about the US export regulation limitations?

- -

-US laws placed restrictions on the export of defense articles, which includes -some types of cryptographic software. PGP and ssh, among others, fall into -this category. For the sarge release packages in this archive were -moved to the main archive (or to non-free, if applicable) due to the -US relaxing its regulations on the export of cryptography. -

- -

-To prevent anyone from taking unnecessary legal risks, certain Debian GNU/Linux -packages were only available from a non-US site ftp://non-US.debian.org/debian-non-US/, -with numerous mirror sites all of which are also outside of the US, see -ftp://non-US.debian.org/debian-non-US/README.non-US -for a full list. These sites still exist (for the benefit of users of -woody) but its contents are no longer supported and are considered -obsolete. Please remove any mentions to non-US from your sources in your -/etc/apt/sources.list configuration file. -

- -
- -

4.10 Where is pine?

- -

-Due to its restrictive license, it's in the non-free area. Moreover, since -license does not even allow modified binaries to be distributed, you have to -compile it yourself from the source and the Debian patches. -

- -

-The source package name is pine. You can use the -pine-tracker package to be notified about when you need to -upgrade. -

- -

-Note that there are many replacements for both pine and pico, such as -mutt and nano, that are located in the main section. -

- -
- -

4.11 Where is qmail/ezmlm/djbdns?

- -

-Dan J. Bernstein distributes all -software he has written with a restrictive license, consequently, -it's in the non-free area. Since the license he uses does not allow modified -binaries to be distributed, you have to compile it yourself from the source and -the Debian patches to obtain a binary package you can install in your Debian -GNU/Linux system. -

- -

-The source package names are qmail-src, ezmlm-src and -djbdns-installer, respectively. -

- -

-For qmail you need to install qmail-src first and -then run build-qmail to build the Debian package. You also need -to do install the ucspi-tcp-src package to get ucspi-tcp, which -qmail depends on. -

- -

-Dan J. Bernstein maintains a FAQ from distributors page -if you are interested in reading his reasons (one of which is Cross-platform -compatibility) -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-software.html b/includes/etch/install/doc/FAQ/html/ch-software.html new file mode 120000 index 000000000..f75c0ab2c --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-software.html @@ -0,0 +1 @@ +ch-software.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-support.html b/includes/etch/install/doc/FAQ/html/ch-support.html deleted file mode 100644 index f910fe751..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-support.html +++ /dev/null @@ -1,525 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Getting support for Debian GNU/Linux - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 11 - Getting support for Debian GNU/Linux -

- -
- -

11.1 What other documentation exists on and for a Debian system?

- -
    -
  • -

    -The Debian GNU/Linux reference covers many aspects of system administration -through shell-command examples. Basic tutorials, tips, and other information -are provided for many different topics ranging from system administration to -programming. -

    - -

    -Get it from the debian-reference package, or at http://www.debian.org/doc/user-manuals#quick-reference. -

    -
    • -
-
    -
  • -

    -Policy manual documents the policy requirements for the distribution, i.e. the -structure and contents of the Debian archive, several design issues of the -operating system etc. It also includes the technical requirements that each -package must satisfy to be included in the distribution, and documents the -basic technical aspects of Debian binary and source packages. -

    - -

    -Get it from the debian-policy package, or at http://www.debian.org/doc/devel-manuals#policy. -

    -
    • -
-
    -
  • -

    -Documentation developed by the Debian Documentation Project. It is available -at http://www.debian.org/doc/ and -includes user guides, administration guides and security guides for the Debian -GNU/Linux operating system. -

    -
    • -
-
    -
  • -

    -Documentation on installed Debian packages: Most packages have files that are -unpacked into /usr/share/doc/PACKAGE. -

    -
    • -
-
    -
  • -

    -Documentation on the Linux project: The Debian package doc-linux -installs all of the most recent versions of the HOWTOs and mini-HOWTOs from the -Linux Documentation Project. -

    -
    • -
-
    -
  • -

    -Unix-style `man' pages: Most commands have manual pages written in the style of -the original Unix 'man' files. They are referenced by the section of the 'man' -directory where they reside: e.g., foo(3) refers to a manual page which resides -in /usr/share/man/man3/, and it can be called by executing the command: -man 3 foo, or just man foo if section 3 is the first -one containing a page on foo. -

    - -

    -One can learn which directory of /usr/share/man/ contains a -certain manual page by executing man -w foo. -

    - -

    -New Debian users should note that the 'man' pages of many general system -commands are not available until they install these packages: -

    -
      -
    • -

      -man-db, which contains the man program itself, and -other programs for manipulating the manual pages. -

      -
      • -
    - -
    • -
-
    -
  • -

    -GNU-style `info' pages: User documentation for many commands, particularly GNU -tools, is available not in `man' pages, but in `info' files which can be read -by the GNU tool info, by running M-x info within GNU -Emacs, or with some other Info page viewer. -

    - -

    -Its main advantage over the original `man' pages are that it is a hypertext -system. It does not require the WWW, however; info can -be run from a plain text console. It was designed by Richard Stallman and -preceded the WWW. -

    -
    • -
- -

-Note that you may access a lot of documentation on your system by using a WWW -browser, through `dwww', `dhelp' or `doccentral' commands, found in respective -packages. -

- -
- -

11.2 Are there any on-line resources for discussing Debian?

- -

-Yes. In fact, the main method of support Debian provides to our users is by -the way of e-mail. -

- -
- -

11.2.1 Mailing lists

- -

-There are a lot of Debian-related mailing -lists. -

- -

-On a system with the doc-debian package installed there is a -complete list of mailing lists in -/usr/share/doc/debian/mailing-lists.txt. -

- -

-Debian mailing lists are named following the pattern -debian-list-subject. Examples are debian-announce, debian-user, -debian-news. To subscribe to any list debian-list-subject, send -mail to debian-list-subject-request@lists.debian.org with the word -"subscribe" in the Subject: header. Be sure to remember to add --request to the e-mail address when using this method to subscribe or -unsubscribe. Otherwise your e-mail will go to the list itself, which could be -embarrassing or annoying, depending on your point of view. -

- -

-If you have a forms-capable World Wide Web browser, you can subscribe to -mailing lists using the WWW form. You -can also un-subscribe using a WWW form. -

- -

-The list manager's e-mail address is listmaster@lists.debian.org, -in case you have any trouble. -

- -

-The mailing lists are public forums. All e-mails sent to the lists are also -copied to the public archive, for anybody (even non-subscribers) to browse or -search. Please make sure you never send any confidential or unlicensed -material to the lists. This includes things like e-mail addresses. Of -particular note is the fact that spammers have been known to abuse e-mail -addresses posted to our mailing lists. See the Mailing -Lists Privacy policy for more information. -

- -

-Archives of the Debian mailing lists are available via WWW at http://lists.debian.org/. -

- -
- -

11.2.1.1 What is the code of conduct for the mailing lists?

- -

-When using the Debian mailing lists, please follow these rules: -

- -
    -
  • -

    -Do not flame; it is not polite. The people developing Debian are all -volunteers, donating their time, energy and money in an attempt to bring the -Debian project together. -

    -
    • -
-
    -
  • -

    -Do not use foul language; besides, some people receive the lists via packet -radio, where swearing is illegal. -

    -
    • -
-
    -
  • -

    -Make sure that you are using the proper list. Never post your -(un)subscription requests to the mailing list itself[6] -

    -
    • -
- - -
- -

11.2.2 Maintainers

- -

-Users can address questions to individual package maintainers using e-mail. To -reach a maintainer of a package called xyz, send e-mail to -xyz@packages.debian.org. -

- -
- -

11.2.3 Usenet newsgroups

- -

-Users should post non-Debian-specific questions to one of the Linux USENET -groups, which are named comp.os.linux.* or linux.*. There are several lists of -Linux Usenet newsgroups and other related resources on the WWW, e.g. on the -Linux Online -and LinuxJournal sites. -

- -
- -

11.3 Is there a quick way to search for information on Debian GNU/Linux?

- -

-There is a variety of search engines that serve documentation related to -Debian: -

- -
    -
  • -

    -Google Groups: a search -engine for newsgroups. -

    - -

    -For example, to find out what experiences people have had with finding drivers -for Promise controllers under Debian, try searching on the phrase Promise -Linux driver. This will show you all the postings that contain these -strings, i.e. those where people discussed these topics. If you add -Debian to those search strings, you'll also get the postings -specifically related to Debian. -

    -
    • -
-
    -
  • -

    -Any of the common web spidering engines, such as AltaVista or Google, as long as you use the right -search terms. -

    - -

    -For example, searching on the string "cgi-perl" gives a more detailed -explanation of this package than the brief description field in its control -file. -

    -
    • -
- -
- -

11.4 Are there logs of known bugs?

- -

-Reports on unsolved (and closed) issues are publicly available: Debian -promissed to do so by stating "We will not hide problems" in the -Debian Social -Contract. -

- -

-The Debian GNU/Linux distribution has a bug tracking system (BTS) which files -details of bugs reported by users and developers. Each bug is given a number, -and is kept on file until it is marked as having been dealt with. -

- -

-Copies of this information are available at http://www.debian.org/Bugs/. -

- -

-A mail server provides access to the bug tracking system database via e-mail. -In order to get the instructions, send an e-mail to request@bugs.debian.org -with "help" in the body. -

- -
- -

11.5 How do I report a bug in Debian?

- -

-If you have found a bug in Debian, please read the instructions for reporting a -bug in Debian. These instructions can be obtained in one of several ways: -

-
    -
  • -

    -By anonymous FTP. Debian mirror sites contain the instructions in the file -doc/bug-reporting.txt. -

    -
    • -
- -
    -
  • -

    -On any Debian system with the doc-debian package installed. The -instructions are in the file -/usr/share/doc/debian/bug-reporting.txt. -

    -
    • -
- -

-You can use the package reportbug that will guide you through the -reporting process and mail the message to the proper address, with some extra -details about your system added automatically. It will also show you a list of -bugs already reported to the package you are reporting against in case your bug -has been reported previously, so that you can additional information to the -existing bug report. -

- -

-If you want to mail the report with an e-mail program, send a message to -submit@bugs.debian.org. The -message's first line must be similar to -

- -
-     Package: package-name
-
- -

-(replace package-name with the name of the package). The next line -should relate the package version number in a similar way: -

- -
-     Version: version-number
-
- -

-The version number for any package installed on your system can be obtained -using the command line -

- -
-     dpkg -s package-name
-
- -

-This section is referred to as the pseudo-header. The rest of the message -should contain the description of the bug (please make it moderately detailed), -the Debian release you are using, and versions of other relevant packages. The -Debian release number will be displayed by the command -

- -
-     cat /etc/debian_version
-
- -

-Expect to get an automatic acknowledgement of your bug report. It will also be -automatically given a bug tracking number, entered into the bug log and -forwarded to the debian-bugs-dist mailing list. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-support.html b/includes/etch/install/doc/FAQ/html/ch-support.html new file mode 120000 index 000000000..978d556ab --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-support.html @@ -0,0 +1 @@ +ch-support.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/ch-uptodate.html b/includes/etch/install/doc/FAQ/html/ch-uptodate.html deleted file mode 100644 index 180431bcf..000000000 --- a/includes/etch/install/doc/FAQ/html/ch-uptodate.html +++ /dev/null @@ -1,479 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Keeping your Debian system up-to-date - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -
Chapter 8 - Keeping your Debian system up-to-date -

- -
- -

-A Debian goal is to provide a consistent upgrade path and a secure upgrade -process. We always do our best to make upgrading to new releases a smooth -procedure. In case there's some important note to add to the upgrade process, -the packages will alert the user, and often provide a solution to a possible -problem. -

- -

-You should also read the Release Notes document that describes the details of -specific upgrades. It is shipped on all Debian CDs and available on the WWW at -http://www.debian.org/releases/stable/releasenotes. -

- -
- -

8.1 How can I upgrade my Debian 1.3.1 (or earlier) distribution, based on libc5, to 2.0 (or later), based on libc6?

- -

-There are several ways to upgrade: -

- -
    -
  • -

    -Following closely the Debian -libc5 to libc6 Mini-HOWTO and upgrade the most important packages by -hand. autoup.sh is based on this Mini-HOWTO, so this method -should work more or less like using autoup.sh. -

    -
    • -
-
    -
  • -

    -Using a libc5-based apt. APT stands for Advanced Package Tool, -and it might replace dselect some day. Currently, it works just as a -command-line interface, or as a dselect access method. You will find a libc5 -version in the dists/slink/main/upgrade-older-i386 directory at -the Debian archives. -

    -
    • -
-
    -
  • -

    -Using just dselect, without upgrading any package by hand first. It is highly -recommended that you do NOT use this method if you can avoid it, because -dselect alone currently does not install packages in the optimal order. APT -works much better and it is safer. -

    -
    • -
- -
- -

8.2 How can I keep my Debian system current?

- -

-One could simply execute an anonymous ftp call to a Debian archive, then peruse -the directories until one finds the desired file, and then fetch it, and -finally install it using dpkg. Note that dpkg will -install upgrade files in place, even on a running system. Sometimes, a revised -package will require the installation of a newly revised version of another -package, in which case the installation will fail until/unless the other -package is installed. -

- -

-Many people find this approach much too time-consuming, since Debian evolves so -quickly -- typically, a dozen or more new packages are uploaded every week. -This number is larger just before a new major release. To deal with this -avalanche, many people prefer to use a more automated method. Several -different packages are available for this purpose: -

- -
- -

8.2.1 aptitude

- -

-APT is an advanced interface to the Debian packaging system. It features -complete installation ordering, multiple source capability and several other -unique features, see the User's Guide in -/usr/share/doc/apt-doc/guide.html/index.html (you will have to -install the apt-doc package). -

- -

-aptitude is the recommended package manager for Debian GNU/Linux -systems. It is a text-based interface to APT using the curses library, and can -be used to perform management tasks in a fast and easy way. -

- -

-Before you can use aptitude, you'll have to edit the -/etc/apt/sources.list file to set it up. If you wish to upgrade -to the latest stable version of Debian, you'll probably want to use a source -like this one: -

- -
-     http://http.us.debian.org/debian stable main contrib non-free
-
- -

-You can replace http.us.debian.org with the name of a faster Debian mirror near -you. See the mirror list at http://www.debian.org/misc/README.mirrors -for more information. -

- -

-More details on this can be found in the sources.list(8) manual -page. -

- -

-To update your system, run -

- -
-     aptitude update
-
- -

-followed by -

- -
-     aptitude dist-upgrade
-
- -

-Answer any questions that might come up, and your system will be upgraded. See -also aptitude, Section 7.1.3. -

- -
- -

8.2.2 apt-get, dselect and apt-cdrom

- -

-apt-get is an APT-based command-line tool for handling packages, -and the APT dselect method is an interface to APT through dselect. -Both of these provide a simple, safe way to install and upgrade packages. -

- -

-To use apt-get, install the apt package, and edit the -/etc/apt/sources.list file to set it up, just as for aptitude, Section 8.2.1. -

- -

-Then run -

- -
-     apt-get update
-
- -

-followed by -

- -
-     apt-get dist-upgrade
-
- -

-Answer any questions that might come up, and your system will be upgraded. See -also the apt-get(8) manual page, as well as APT, Section 7.1.2. -

- -

-To use APT with dselect, choose the APT access method in dselect's -method selection screen (option 0) and then specify the sources that should be -used. The configuration file is /etc/apt/sources.list. See also -dselect, Section 7.1.4. -

- -

-If you want to use CDs to install packages, you can use apt-cdrom. -For details, please see the Release Notes, section "Setting up for an -upgrade from a local mirror". -

- -

-Please note that when you get and install the packages, you'll still have them -kept in your /var directory hierarchy. To keep your partition from -overflowing, remember to delete extra files using apt-get clean -and apt-get autoclean, or to move them someplace else (hint: use -apt-move). -

- -
- -

8.2.3 dpkg-ftp

- -

-This is an older access method for dselect. It can be invoked -from within dselect, thereby allowing a user the ability to -download files and install them directly in one step. To do this, select the -ftp access method in dselect (option 0) and specify -the remote host name and directory. dpkg-ftp will then -automatically download the files that are selected (either in this session of -dselect or earlier ones). -

- -

-Note that, unlike the mirror program, dpkg-ftp does -not grab everything at a mirror site. Rather, it downloads only those files -which you have selected (when first starting up dpkg-ftp), and -which need to be updated. -

- -

-dpkg-ftp is somewhat obsolete. You should use the APT access -method with ftp:// URLs in sources.list instead. -

- -
- -

8.2.4 mirror

- -

-This Perl script, and its (optional) manager program called -mirror-master, can be used to fetch user-specified parts of a -directory tree from a specified host via anonymous FTP. -

- -

-mirror is particularly useful for downloading large volumes of -software. After the first time files have been downloaded from a site, a file -called .mirrorinfo is stored on the local host. Changes to the -remote file system are tracked automatically by mirror, which -compares this file to a similar file on the remote system and downloads only -changed files. -

- -

-The mirror program is generally useful for updating local copies -of remote directory trees. The files fetched need not be Debian files. (Since -mirror is a Perl script, it can also run on non-Unix systems.) -Though the mirror program provides mechanisms for excluding files -names of which match user-specified strings, this program is most useful when -the objective is to download whole directory trees, rather than selected -packages. -

- -
- -

8.2.5 dpkg-mountable

- -

-dpkg-mountable adds an access method called `mountable' to dselect's list, -which allows you to install from any file system specified in /etc/fstab. For -example, the archive could be a normal hard disk partition or an NFS server, -which it will automatically mount and umount for you if necessary. -

- -

-It also has some extra features not found in the standard dselect methods, such -as provision for a local file tree (either parallel to the main distribution or -totally separate), and only getting packages which are required, rather than -the time-consuming recursive directory scan, as well as logging of all dpkg -actions in the install method. -

- -
- -

8.3 Must I go into single user mode in order to upgrade a package?

- -

-No. Packages can be upgraded in place, even in running systems. Debian has a -start-stop-daemon program that is invoked to stop, then restart -running process if necessary during a package upgrade. -

- -
- -

8.4 Do I have to keep all those .deb archive files on my disk?

- -

-No. If you have downloaded the files to your disk (which is not absolutely -necessary, see above for the description of dpkg-ftp), then after you have -installed the packages, you can remove them from your system. -

- -
- -

8.5 How can I keep a log of the packages I added to the system? I'd like to know when which package upgrades and removals have occured!

- -

-Passing the --log-option to dpkg makes -dpkg log status change updates and actions. It logs both the -dpkg-invokation (e.g. -

- -
-     2005-12-30 18:10:33 install hello 1.3.18 2.1.1-4
-
- -

-) and the results (e.g. -

- -
-     2005-12-30 18:10:35 status installed hello 2.1.1-4
-
- -

-) If you'd like to log all your dpkg invokations (even those done -using frontends like aptitude), you could add -

- -
-     log /var/log/dpkg.log
-
- -

-to your /etc/dpkg/dpkg.cfg. Be sure the created logfile gets -rotated periodically. If you're using logrotate, this can be -achieved by creating a file /etc/logrotate.d/dpkg with contents -

- -
-     /var/log/dpkg {
-       missingok
-       notifempty
-     }
-
- -

-More details on dpkg logging can be found in the -dpkg(1) manual page. -

- -

-aptitude logs the package installations, removals, and upgrades -that it intends to perform to /var/log/aptitude. Note that the -results of those actions are not recorded in this file! -

- -

-Another way to record your actions is to run your package management session -within the script(1) program. -

- -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/ch-uptodate.html b/includes/etch/install/doc/FAQ/html/ch-uptodate.html new file mode 120000 index 000000000..37f685277 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/ch-uptodate.html @@ -0,0 +1 @@ +ch-uptodate.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/footnotes.html b/includes/etch/install/doc/FAQ/html/footnotes.html deleted file mode 100644 index 37d57bb1e..000000000 --- a/includes/etch/install/doc/FAQ/html/footnotes.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - Footnotes - - - - - -
- -

-The Debian GNU/Linux FAQ -
Footnotes

- -

1

- -

-When the present-day sid did not exist, the FTP site organization had one major -flaw: there was an assumption that when an architecture is created in the -current unstable, it will be released when that distribution becomes the new -stable. For many architectures that isn't the case, with the result that those -directories had to be moved at release time. This was impractical because the -move would chew up lots of bandwidth. -

- -

-The archive administrators worked around this problem for several years by -placing binaries for unreleased architectures in a special directory called -"sid". For those architectures not yet released, the first time they -were released there was a link from the current stable to sid, and from then on -they were created inside the unstable tree as normal. This layout was somewhat -confusing to users. -

- -

-With the advent of package pools (see What's in the -pool directory?, Section 5.10), binary packages began to be -stored in a canonical location in the pool, regardless of the distribution, so -releasing a distribution no longer causes large bandwidth consumption on the -mirrors (there is, however, a lot of gradual bandwidth consumption throughout -the development process). -

- -

2

- -

-dists/stable/main, dists/stable/contrib, -dists/stable/non-free, and dists/unstable/main/, etc. -

- -

3

- -

-Historically, packages were kept in the subdirectory of dists -corresponding to which distribution contained them. This turned out to cause -various problems, such as large bandwidth consumption on mirrors when major -changes were made. This was fixed with the introduction of the package pool. -

- -

-The dists directories are still used for the index files used by -programs like apt. You may also still see paths containing -dists/potato or dists/woody in the Filename header -field of some older packages. -

- -

4

- -

-Notice that there are ports that make this tool available with other package -management systems, like Red Hat package manager, also known as -rpm -

- -

5

- -

-Although this can also lead to systems with more packages installed than they -actually need to work. -

- -

6

- -

-Use the debian-list-subject-REQUEST@lists.debian.org address for -that. -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/footnotes.html b/includes/etch/install/doc/FAQ/html/footnotes.html new file mode 120000 index 000000000..c18fdfb77 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/footnotes.html @@ -0,0 +1 @@ +footnotes.en.html \ No newline at end of file diff --git a/includes/etch/install/doc/FAQ/html/index.html b/includes/etch/install/doc/FAQ/html/index.html deleted file mode 100644 index 7adba8c74..000000000 --- a/includes/etch/install/doc/FAQ/html/index.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - -The Debian GNU/Linux FAQ - - - - - -

-
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
- -

Abstract

- -

-This document answers questions frequently asked about Debian GNU/Linux. -

- -
- -

Copyright Notice

- -

-Copyright © 1996-2005 by Software in the Public Interest -

- -

-Permission is granted to make and distribute verbatim copies of this document -provided the copyright notice and this permission notice are preserved on all -copies. -

- -

-Permission is granted to copy and distribute modified versions of this document -under the conditions for verbatim copying, provided that the entire resulting -derived work is distributed under the terms of a permission notice identical to -this one. -

- -

-Permission is granted to copy and distribute translations of this document into -another language, under the above conditions for modified versions, except that -this permission notice may be included in translations approved by the Free -Software Foundation instead of in the original English. -

- -
- -

Contents

- - - -
- -

-[ previous ] -[ Contents ] -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -[ 6 ] -[ 7 ] -[ 8 ] -[ 9 ] -[ 10 ] -[ 11 ] -[ 12 ] -[ 13 ] -[ 14 ] -[ 15 ] -[ next ] -

- -
- -

-The Debian GNU/Linux FAQ -

- -
-version 3.1.5, 17 January 2007
-
-Authors are listed at Debian FAQ Authors
-
-
-
- - - - - diff --git a/includes/etch/install/doc/FAQ/html/index.html b/includes/etch/install/doc/FAQ/html/index.html new file mode 120000 index 000000000..0e8542211 --- /dev/null +++ b/includes/etch/install/doc/FAQ/html/index.html @@ -0,0 +1 @@ +index.en.html \ No newline at end of file diff --git a/manpages/lh_binary.1.de b/manpages/lh_binary.1.de index d5fbfb4dc..7ae347eb5 100644 --- a/manpages/lh_binary.1.de +++ b/manpages/lh_binary.1.de @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_BINARY 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* @@ -13,6 +13,8 @@ lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binar Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. .IP "\fIlh_binary_chroot\fR(1)" 4 kopiert chroot in chroot. +.IP "\fIlh_binary_debian\-installer\fR(1)" 4 +kopiert debian\-installer in das Binary\-Image. .IP "\fIlh_binary_encryption\fR(1)" 4 verschl\[:u]sselt das Root\-Dateisystem. .IP "\fIlh_binary_grub\fR(1)" 4 @@ -39,8 +41,8 @@ erstellt den Netboot Binary\-Tarball. erstell das Root\-Dateisystem. .IP "\fIlh_binary_syslinux\fR(1)" 4 kopiert syslinux in das Binary\-Image. -.IP "\fIlh_binary_usb\fR(1)" 4 -erstellt das USB Binary\-Image. +.IP "\fIlh_binary_usb-hdd\fR(1)" 4 +erstellt das USB-hdd Binary\-Image. .IP "\fIlh_binary_yaboot\fR(1)" 4 kopiert yaboot in das Binary\-Image. diff --git a/manpages/lh_binary.1.en b/manpages/lh_binary.1.en index b44f1eadc..3f5ba5b34 100644 --- a/manpages/lh_binary.1.en +++ b/manpages/lh_binary.1.en @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_BINARY 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* @@ -13,6 +13,8 @@ lh_binary is a meta\-helper. It calls all necessary helpers to complete the bina Here is the complete list of available binary helper commands. See their man pages for additional documentation. .IP "\fIlh_binary_chroot\fR(1)" 4 copies chroot into chroot. +.IP "\fIlh_binary_debian-installer\fR(1)" 4 +copies debian-installer into the binary image. .IP "\fIlh_binary_encryption\fR(1)" 4 encrypts the root filesystem. .IP "\fIlh_binary_grub\fR(1)" 4 @@ -39,8 +41,8 @@ creates the netboot binary tarball. creates the root filesystem. .IP "\fIlh_binary_syslinux\fR(1)" 4 copies syslinux into the binary image. -.IP "\fIlh_binary_usb\fR(1)" 4 -creates the USB binary image. +.IP "\fIlh_binary_usb-hdd\fR(1)" 4 +creates the USB-hdd binary image. .IP "\fIlh_binary_yaboot\fR(1)" 4 copies yaboot into the binary image. diff --git a/manpages/lh_bootstrap.1.de b/manpages/lh_bootstrap.1.de index 64734191f..138fea28f 100644 --- a/manpages/lh_bootstrap.1.de +++ b/manpages/lh_bootstrap.1.de @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_BOOTSTRAP 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* diff --git a/manpages/lh_bootstrap.1.en b/manpages/lh_bootstrap.1.en index 0330fbcb9..4a9552c56 100644 --- a/manpages/lh_bootstrap.1.en +++ b/manpages/lh_bootstrap.1.en @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_bootstrap \- meta\-helper for lh_bootstrap_* diff --git a/manpages/lh_bootstrap_cdebootstrap.1.de b/manpages/lh_bootstrap_cdebootstrap.1.de index 4584d4c34..ad0db4ae7 100644 --- a/manpages/lh_bootstrap_cdebootstrap.1.de +++ b/manpages/lh_bootstrap_cdebootstrap.1.de @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_cdebootstrap.1.en b/manpages/lh_bootstrap_cdebootstrap.1.en index 7a2b352a2..a5c4f38eb 100644 --- a/manpages/lh_bootstrap_cdebootstrap.1.en +++ b/manpages/lh_bootstrap_cdebootstrap.1.en @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_debootstrap.1.de b/manpages/lh_bootstrap_debootstrap.1.de index 252522c81..9efa212cd 100644 --- a/manpages/lh_bootstrap_debootstrap.1.de +++ b/manpages/lh_bootstrap_debootstrap.1.de @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) diff --git a/manpages/lh_bootstrap_debootstrap.1.en b/manpages/lh_bootstrap_debootstrap.1.en index a472272fe..ec209bb4a 100644 --- a/manpages/lh_bootstrap_debootstrap.1.en +++ b/manpages/lh_bootstrap_debootstrap.1.en @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) diff --git a/manpages/lh_build.1.de b/manpages/lh_build.1.de index f49efae14..d0d6b24dc 100644 --- a/manpages/lh_build.1.de +++ b/manpages/lh_build.1.de @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_BUILD 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes @@ -12,7 +12,7 @@ lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein .SH META\-HELPER Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. .IP "\fIlh_binary\fR(1)" 4 -erstellt ein Binary-Image. +erstellt ein Binary\-Image. .IP "\fIlh_bootstrap\fR(1)" 4 erstellt das Grundsystem. .IP "\fIlh_chroot\fR(1)" 4 diff --git a/manpages/lh_build.1.en b/manpages/lh_build.1.en index 24945076f..340df4c71 100644 --- a/manpages/lh_build.1.en +++ b/manpages/lh_build.1.en @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_BUILD 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_build \- building a live system diff --git a/manpages/lh_chroot.1.de b/manpages/lh_chroot.1.de index b84bfc50c..0063068fe 100644 --- a/manpages/lh_chroot.1.de +++ b/manpages/lh_chroot.1.de @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_CHROOT 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* diff --git a/manpages/lh_chroot.1.en b/manpages/lh_chroot.1.en index 347ec0512..8ffc2c2f0 100644 --- a/manpages/lh_chroot.1.en +++ b/manpages/lh_chroot.1.en @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_CHROOT 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_chroot \- meta\-helper for lh_chroot_* diff --git a/manpages/lh_clean.1.de b/manpages/lh_clean.1.de index aacc0a32b..8c1b40dc4 100644 --- a/manpages/lh_clean.1.de +++ b/manpages/lh_clean.1.de @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_CLEAN 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_clean \- r\[:a]umt das Build-Verzeichnis auf diff --git a/manpages/lh_clean.1.en b/manpages/lh_clean.1.en index acdd3de13..c631181b0 100644 --- a/manpages/lh_clean.1.en +++ b/manpages/lh_clean.1.en @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_CLEAN 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_clean \- clean up system build directories diff --git a/manpages/lh_source.1.de b/manpages/lh_source.1.de index 238903e77..35dba1817 100644 --- a/manpages/lh_source.1.de +++ b/manpages/lh_source.1.de @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_SOURCE 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* @@ -25,8 +25,8 @@ erstellt CD/DVD Source-Image. erstellt md5sum.txt im Source-Image. .IP "\fIlh_source_net\fR(1)" 4 erstellt Netboot Source-Tarball. -.IP "\fIlh_source_usb\fR(1)" 4 -erstellt USB Source-Tarball. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +erstellt USB-hdd Source-Tarball. .SH SIEHE AUCH \fIlive\-helper\fR(7) diff --git a/manpages/lh_source.1.en b/manpages/lh_source.1.en index a259101ad..b52c6652e 100644 --- a/manpages/lh_source.1.en +++ b/manpages/lh_source.1.en @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_SOURCE 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* @@ -25,8 +25,8 @@ creates the CD/DVD source image. creates md5sum.txt in the source image. .IP "\fIlh_source_net\fR(1)" 4 creates the netboot source tarball. -.IP "\fIlh_source_usb\fR(1)" 4 -creates the USB source image. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +creates the USB-hdd source image. .SH SEE ALSO \fIlive\-helper\fR(7) diff --git a/manpages/lh_testroot.1.de b/manpages/lh_testroot.1.de index d78cadb2e..a1be8b4c0 100644 --- a/manpages/lh_testroot.1.de +++ b/manpages/lh_testroot.1.de @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH LH_TESTROOT 1 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME lh_testroot \- stellt sicher dass das System als root gebaut wird diff --git a/manpages/lh_testroot.1.en b/manpages/lh_testroot.1.en index 653ecd787..c6aae69f4 100644 --- a/manpages/lh_testroot.1.en +++ b/manpages/lh_testroot.1.en @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LH_TESTROOT 1 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME lh_testroot \- ensure that a system is built as root diff --git a/manpages/live-helper.7.de b/manpages/live-helper.7.de index 8be6c3cb8..45e028688 100644 --- a/manpages/live-helper.7.de +++ b/manpages/live-helper.7.de @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "23.04.2007" "1.0~a7" "live\-helper" +.TH LIVE\-HELPER 7 "30.04.2007" "1.0~a8" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme @@ -29,6 +29,8 @@ Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommando Meta\-Helper f\[:u]r lh_binary_* .IP "\fIlh_binary_chroot\fR(1)" 4 kopiert chroot in chroot. +.IP "\fIlh_binary_debian\-installer\fR(1)" 4 +kopiert debian-\installer in das Binary\-Image. .IP "\fIlh_binary_encryption\fR(1)" 4 verschl\[:u]sselt das Root\-Dateisystem. .IP "\fIlh_binary_grub\fR(1)" 4 @@ -55,8 +57,8 @@ erstellt den Netboot Binary\-Tarball. erstell das Root\-Dateisystem. .IP "\fIlh_binary_syslinux\fR(1)" 4 kopiert syslinux in das Binary\-Image. -.IP "\fIlh_binary_usb\fR(1)" 4 -erstellt das USB Binary\-Image. +.IP "\fIlh_binary_usb-hdd\fR(1)" 4 +erstellt das USB-hdd Binary\-Image. .IP "\fIlh_binary_yaboot\fR(1)" 4 kopiert yaboot in das Binary\-Image. .IP "\fIlh_bootstrap\fR(1)" 4 @@ -135,8 +137,8 @@ erstellt CD/DVD Source-Image. erstellt md5sum.txt im Source-Image. .IP "\fIlh_source_net\fR(1)" 4 erstellt Netboot Source-Tarball. -.IP "\fIlh_source_usb\fR(1)" 4 -erstellt USB Source-Tarball. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +erstellt USB-hdd Source-Tarball. .IP "\fIlh_testroot\fR(1)" 4 stellt sicher dass das System als root gebaut wird. diff --git a/manpages/live-helper.7.en b/manpages/live-helper.7.en index b32a73610..ce7699fce 100644 --- a/manpages/live-helper.7.en +++ b/manpages/live-helper.7.en @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-04\-30" "1.0~a8" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs @@ -29,6 +29,8 @@ Here is the complete list of available live\-helper commands. See their man page meta\-helper for lh_binary_*. .IP "\fIlh_binary_chroot\fR(1)" 4 copies chroot into chroot. +.IP "\fIlh_binary_debian\-installer\fR(1)" 4 +copies debian-installer into the binary image. .IP "\fIlh_binary_encryption\fR(1)" 4 encrypts the root filesystem. .IP "\fIlh_binary_grub\fR(1)" 4 @@ -55,8 +57,8 @@ creates the netboot binary tarball. creates the root filesystem. .IP "\fIlh_binary_syslinux\fR(1)" 4 copies syslinux into the binary image. -.IP "\fIlh_binary_usb\fR(1)" 4 -creates the USB binary image. +.IP "\fIlh_binary_usb-hdd\fR(1)" 4 +creates the USB-hdd binary image. .IP "\fIlh_binary_yaboot\fR(1)" 4 copies yaboot into the binary image. .IP "\fIlh_bootstrap\fR(1)" 4 @@ -133,8 +135,8 @@ creates harddisk source tarball. creates CD/DVD source image. .IP "\fIlh_source_net\fR(1)" 4 creates netboot source tarball. -.IP "\fIlh_source_usb\fR(1)" 4 -creates USB source image. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +creates USB-hdd source image. .IP "\fIlh_testroot\fR(1)" 4 checks for root privileges. diff --git a/manpages/make-live.1.de b/manpages/make-live.1.de index c756f790d..dd453495b 100644 --- a/manpages/make-live.1.de +++ b/manpages/make-live.1.de @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "23.04.2007" "1.0~a7" "live\-helper" +.TH MAKE\-LIVE 1 "30.04.2007" "1.0~a8" "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\fR|\fInet\fR] -[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\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] [\-\-includes \fIPATH\fR] [\-\-templates \fIPATH\fR] [\-\-breakpoints] diff --git a/manpages/make-live.1.en b/manpages/make-live.1.en index b41a2fbf4..a142a02e0 100644 --- a/manpages/make-live.1.en +++ b/manpages/make-live.1.en @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "2007\-04\-23" "1.0~a7" "live\-helper" +.TH MAKE\-LIVE 1 "2007\-04\-30" "1.0~a8" "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\fR|\fInet\fR] -[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\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] [\-\-includes \fIPATH\fR] [\-\-templates \fIPATH\fR] [\-\-breakpoints] diff --git a/templates/syslinux/boot.txt b/templates/syslinux/boot.txt new file mode 100644 index 000000000..2fe3eade7 --- /dev/null +++ b/templates/syslinux/boot.txt @@ -0,0 +1,3 @@ +splash.rle + +Press F1control and F then 1 for help, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f1.txt b/templates/syslinux/f1.txt index b6ca5c58f..b54d5f3a5 100644 --- a/templates/syslinux/f1.txt +++ b/templates/syslinux/f1.txt @@ -1,25 +1,25 @@ - 0fWelcome to Debian Live07 09F107 + 0fWelcome to Debian GNU/Linux!07 09F107 -This is a Debian Live system CD-ROM, built on LIVE_DATE. +This is a Debian Live CD-ROM. +It was built on LIVE_DATE. 0fHELP INDEX07 0fKEY TOPIC07 <09F107> This page, the help index. +<09F207> Prerequisites for installing Debian. <09F307> Boot methods for special ways of using this CD-ROM -<09F407> Special boot parameters, overview. -<09F807> How to get help. -<09F907> About the Debian Live project. +<09F407> Additional boot methods; rescue mode. +<09F507> Special boot parameters, overview. +<09F607> Special boot parameters for special machines. +<09F707> Special boot parameters for selected disk controllers. +<09F807> Special boot parameters for the install system. +<09F907> How to get help. <09F1007> Copyrights and warranties.  For F1-F9 type control and F then the digit 1-9 For F10 type control and F then the digit 0 -  - - - - Press F2 through F10 for details, or ENTER to diff --git a/templates/syslinux/f10.txt b/templates/syslinux/f10.txt index a85b41c52..a1ce65685 100644 --- a/templates/syslinux/f10.txt +++ b/templates/syslinux/f10.txt @@ -1,6 +1,6 @@  0fCOPYRIGHTS AND WARRANTIES07 09F1007 -Debian GNU/Linux is Copyright (C) 1993-2006 Software in the Public Interest, +Debian GNU/Linux is Copyright (C) 1993-2007 Software in the Public Interest, and others. The Debian GNU/Linux system is freely redistributable. After installation, diff --git a/templates/syslinux/f2.txt b/templates/syslinux/f2.txt new file mode 100644 index 000000000..60243d348 --- /dev/null +++ b/templates/syslinux/f2.txt @@ -0,0 +1,23 @@ + 0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207 + +You must have at least 32 megabytes of RAM to use this Debian installer. + +You should have space on your hard disk to create a new disk partition +of at least 256 megabytes to install the base system. You'll need more +disk space to install additional packages, depending on what you wish +to do with your new Debian system. + +See the Installation Manual or the FAQ for more information; both +documents are available at the Debian web site, 0fhttp://www.debian.org/07 + +Thank you for choosing Debian! + + + + + + + + + +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f3.txt b/templates/syslinux/f3.txt index e987a61dd..9cd2ba589 100644 --- a/templates/syslinux/f3.txt +++ b/templates/syslinux/f3.txt @@ -1,23 +1,23 @@  0fBOOT METHODS07 09F307 + 0fAvailable boot methods:07 -0flive07 - Start the live system -- this is the default CD-ROM mode. -0fmemtest07 - Start the memtest86+ RAM tester. +0finstall07 + Start the installation -- this is the default CD-ROM install. +0finstallgui07 + Start the installation using the graphical installer. +0fexpert07 + Start the installation in expert mode, for maximum control. +0fexpertgui07 + Start the installation in expert mode using the graphical installer. To use one of these boot methods, type it at the prompt, optionally followed by any boot parameters. For example: - boot: live foo=bar + boot: install acpi=off If unsure, you should use the default boot method, with no special parameters, by simply pressing enter at the boot prompt. - - - - - -Press F1control and F then 1 for the help index, or ENTER to +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f4.txt b/templates/syslinux/f4.txt index a8bd4e0c7..c2cf4f488 100644 --- a/templates/syslinux/f4.txt +++ b/templates/syslinux/f4.txt @@ -1,23 +1,23 @@ - 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F407 + 0fRESCUE MODE07 09F407 -You can use the following boot parameters at the 0fboot:07 prompt, -in combination with the boot method (see <09F307>). -0f -OPTION PARAMETER TO SPECIFY07 -Check media for defects 0fintegrity-check07 -Set a static ip (no dhcp) 0fip=if,add,netm,gatew07 -Set a default locale 0flocale=07 -Suppress some debug informations 0fquiet07 -Show internal filesystems 0fshowmounts07 -Copy the live media to memory 0ftoram07 -Set initial display mode 0fvga=07 -For example: +0fUse one of these boot methods to rescue an existing install07 - boot: live quiet vga=792 locale=it_IT.UTF-8 +0frescue07 + Boot into rescue mode. +0frescuegui07 + Boot into rescue mode using the graphical installer. -Press F1control and F then 1 for the help index, or ENTER to + + +To use one of these boot methods, type it at the prompt, optionally +followed by any boot parameters. For example: + + boot: rescue acpi=off + + +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f5.txt b/templates/syslinux/f5.txt new file mode 100644 index 000000000..6e73913f4 --- /dev/null +++ b/templates/syslinux/f5.txt @@ -0,0 +1,23 @@ + 0fSPECIAL BOOT PARAMETERS - OVERVIEW07 09F507 + +On a few systems, you may need to specify a parameter at the 0fboot:07 +prompt in order to boot the system. For example, Linux may not be able +to autodetect your hardware, and you may need to explicitly specify +its location or type for it to be recognized. + +For more information about what boot parameters you can use, press: + + <09F607> -- boot parameters for special machines + <09F707> -- boot parameters for various disk controllers + <09F807> -- boot parameters understood by the install system + +Note that to specify a parameter for a particular kernel module, use the form +module.param=value, for example: libata.atapi_enabled=1 + + + + + + + +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f6.txt b/templates/syslinux/f6.txt new file mode 100644 index 000000000..4bdb09a03 --- /dev/null +++ b/templates/syslinux/f6.txt @@ -0,0 +1,23 @@ + 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F607 + +You can use the following boot parameters at the 0fboot:07 prompt, +in combination with the boot method (see <09F307>). +If you use hex numbers you have to use the 0x prefix (e.g., 0x300). +0f +HARDWARE PARAMETER TO SPECIFY07 +IBM PS/1 or ValuePoint (IDE disk) 0fhd=0bcylinders0f,0bheads0f,0bsectors07 +Some IBM ThinkPads 0ffloppy.floppy=thinkpad07 +IBM Pentium Microchannel 0fmca-pentium no-hlt07 +Protect I/O port regions 0freserve=0biobase0f,0bextent07[0f,0b...07] +Workaround faulty FPU (old machines) 0fno38707 +Laptops with screen display problems 0fvga=77107 +Use first serial port at 9600 baud 0fconsole=ttyS0,9600n807 +Force use of generic IDE driver 0fgeneric.all_generic_ide=107 + +If you experience lockups or other hardware failures, +disable buggy APIC interrupt routing 0fnoapic nolapic07 + +For example: + boot: install vga=771 noapic nolapic + +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f7.txt b/templates/syslinux/f7.txt new file mode 100644 index 000000000..48f76c934 --- /dev/null +++ b/templates/syslinux/f7.txt @@ -0,0 +1,23 @@ + 0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07 09F707 + +You can use the following boot parameters at the 0fboot:07 prompt, +in combination with the boot method (see <09F307>). +0f +HARDWARE PARAMETER TO SPECIFY07 +Adaptec 151x, 152x 0faha152x.aha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]] +Adaptec 1542 0faha1542.aha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]] +Adaptec 274x, 284x 0faic7xxx.aic7xxx=no_reset07 (enabled if non-zero) +BusLogic SCSI Hosts 0fBusLogic.BusLogic=0biobase07 +Certain DELL machines 0faic7xxx.aic7xxx=no_probe07 + +This list is incomplete, see the kernel's kernel-parameters.txt file +for more. + + + + +For example: + + boot: install aic7xxx.aic7xxx=no_probe + +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f8.txt b/templates/syslinux/f8.txt index 0e41de02c..04341b621 100644 --- a/templates/syslinux/f8.txt +++ b/templates/syslinux/f8.txt @@ -1,23 +1,23 @@ - 0fGETTING HELP07 09F807 - -If you can't run Debian Live, don't despair! The Debian Live team is -ready to help you! We are interested in hearing about problems, because -in general they don't happen to only 0fone07 person. -We've either already heard about your particular problem and can dispense a -quick fix, or we would like to hear about it and work through it with you, -and the next user who comes up with the same problem will profit from your -experience! - -See the mailinglist and wiki for more information; both -are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07 - - - - - - - - - - -Press F1control and F then 1 for the help index, or ENTER to + 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 09F807 + +You can use the following boot parameters at the 0fboot:07 prompt, +in combination with the boot method (see <09F307>). These parameters +control how the installer works. +0f +RESULT PARAMETER07 +Verbose debugging 0fDEBCONF_DEBUG=507 +Debug boot sequence 0fBOOT_DEBUG=2|307 +Disable framebuffer 0ffb=false07 +Don't probe for USB 0fdebian-installer/probe/usb=false07 +Don't start PCMCIA 0fhw-detect/start_pcmcia=false07 +Force static network config 0fnetcfg/disable_dhcp=true07 +Set keyboard map 0fbootkbd=es07 +Use Braille tty 0fbrltty=driver,device,texttable07 +Use high contrast accessibility theme 0ftheme=dark07 +Use special tasks 0ftasks="kde-desktop, standard"07 + +For example: + + boot: install fb=false + +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/f9.txt b/templates/syslinux/f9.txt index e1344a017..b0cac8dfa 100644 --- a/templates/syslinux/f9.txt +++ b/templates/syslinux/f9.txt @@ -1,11 +1,16 @@ - 0fABOUT THE DEBIAN LIVE PROJECT07 09F907 + 0fGETTING HELP07 09F907 -For information about the Debian Live project, see our web site: -0fhttp://debian-live.alioth.debian.org/07 +If you can't install Debian, don't despair! The Debian team is ready to +help you! We are especially interested in hearing about installation +problems, because in general they don't happen to only 0fone07 person. +We've either already heard about your particular problem and can dispense a +quick fix, or we would like to hear about it and work through it with you, +and the next user who comes up with the same problem will profit from your +experience! -For copyright information, press <09F1007>. +See the Installation Manual or the FAQ for more information; both +documents are available at the Debian web site, 0fhttp://www.debian.org/07 -Thank you for using Debian Live! @@ -15,9 +20,4 @@ Thank you for using Debian Live! - - - - - -Press F1control and F then 1 for the help index, or ENTER to +Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg index b6c465f31..76978319a 100644 --- a/templates/syslinux/isolinux.cfg +++ b/templates/syslinux/isolinux.cfg @@ -1,4 +1,18 @@ -default live + +DISPLAY boot.txt + +F1 f1.txt +F2 f2.txt +F3 f3.txt +F4 f4.txt +F5 f5.txt +F6 f6.txt +F7 f7.txt +F8 f8.txt +F9 f9.txt +F0 f10.txt + +DEFAULT live LIVE_KERNEL_LIVE @@ -6,12 +20,5 @@ 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 +PROMPT 1 +TIMEOUT 0 diff --git a/templates/syslinux/isolinux.txt b/templates/syslinux/isolinux.txt deleted file mode 100644 index 2fe3eade7..000000000 --- a/templates/syslinux/isolinux.txt +++ /dev/null @@ -1,3 +0,0 @@ -splash.rle - -Press F1control and F then 1 for help, or ENTER to \ No newline at end of file -- cgit v1.2.3