diff options
44 files changed, 183 insertions, 129 deletions
@@ -5,7 +5,7 @@ all: install test: set -e; for SCRIPT in functions/* examples/*.sh helpers/* hooks/*; \ do \ - sh -n $$SCRIPT; \ + sh -n $$SCRIPT || exit 1; \ done install: test @@ -76,6 +76,17 @@ uninstall: rm -f $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \ done +update: + for MANPAGE in manpages/*.de manpages/*.en; \ + do \ + sed -i -e 's/30.04.2007/07.05.2007/' \ + -e 's/2007\\-04\\-30/2007\\-05\\-07/' \ + -e 's/1.0~a8/1.0~a9/' \ + $$MANPAGE; \ + done + + sed -i -e 's/1.0~a8/1.0~a9/' functioins/common.sh + clean: distclean: diff --git a/debian/changelog b/debian/changelog index fa71c72..5c84dd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-helper (1.0~a9-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 7 May 2007 00:00:00 +0200 + live-helper (1.0~a8-1) unstable; urgency=medium * New upstream release: diff --git a/debian/copyright b/debian/copyright index cbd1182..9f10967 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,13 @@ This package was debianized by Daniel Baumann <daniel@debian.org> on Mon, 12 Mar 2007 00:00:00 +0100. -It was downloaded from <http://debian-live.alioth.debian.org/>. +It was downloaded from: -Upstream contact: Debian Live <debian-live-devel@lists.alioth.debian.org> + <http://debian-live.alioth.debian.org/> + +Upstream contact: + + Debian Live <debian-live-devel@lists.alioth.debian.org> License: diff --git a/doc/CREDITS b/doc/CREDITS index 120929c..48b4014 100644 --- a/doc/CREDITS +++ b/doc/CREDITS @@ -14,6 +14,7 @@ Patches (alphabetical order): * Markus Bauer <bauer-markus@web.de> * Mathieu Geli <mathieu.geli@gmail.com> * Otavio Salvador <otavio@debian.org> + * Richard Nelson <rjent@rjent.pair.com> * Scott Edwards <debian@foss.daxal.com> * Sebastian Raveau <sebastien.raveau@epita.fr> @@ -26,6 +27,7 @@ Special thanks (alphabetical order): * Ben Armstrong <synrg@debian.org> for his IRC support. * Jason D. Clinton <me@jasonclinton.com> for his work on netboot type. * Otavio Salvador <otavio@debian.org> for his QA patches. + * Richard Nelson <rjent@rjent.pair.com> for live-webbuilder. * Sebastian Raveau <sebastien.raveau@epita.fr> for his work on encryption support. * Scott Edwards <debian@foss.daxal.com> for his work on d-i/g-i integration. diff --git a/doc/ChangeLog b/doc/ChangeLog index 31038c9..6269da3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2007-05-06 Daniel Baumann <daniel@debian.org> + + * templates/syslinux: + - Updated again. + * helpers/lh_config: + - Fixed overwriting of LH_* options. + * helpers/lh_binary_includes: + - Fixed a quoting typo. + - Working arround symlinks on usb-hdd binary images. + 2007-04-31 Daniel Baumann <daniel@debian.org> * helpers/*: diff --git a/functions/common.sh b/functions/common.sh index d9642bf..88a883a 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a8" +VERSION="1.0~a9" diff --git a/helpers/lh_binary b/helpers/lh_binary index c3575cd..038a19a 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -26,40 +26,40 @@ Echo_debug "Init ${PROGRAM}" Breakpoint "binary: Init" # Preparing root filesystem -lh_binary_chroot "${@}" +lh_binary_chroot ${*} # Configuring chroot -lh_chroot_proc install "${@}" -lh_chroot_sysfs install "${@}" -lh_chroot_hosts install "${@}" -lh_chroot_resolv install "${@}" -lh_chroot_sources install "${@}" +lh_chroot_proc install ${*} +lh_chroot_sysfs install ${*} +lh_chroot_hosts install ${*} +lh_chroot_resolv install ${*} +lh_chroot_sources install ${*} # Building root filesystem -lh_binary_rootfs "${@}" -lh_binary_manifest "${@}" -lh_binary_encryption "${@}" +lh_binary_rootfs ${*} +lh_binary_manifest ${*} +lh_binary_encryption ${*} # Prepare images -lh_binary_linuximage "${@}" -lh_binary_debian-installer "${@}" -lh_binary_memtest "${@}" -lh_binary_grub "${@}" -lh_binary_syslinux "${@}" -lh_binary_yaboot "${@}" -lh_binary_includes "${@}" -lh_binary_localincludes "${@}" -lh_binary_md5sum "${@}" +lh_binary_linuximage ${*} +lh_binary_debian-installer ${*} +lh_binary_memtest ${*} +lh_binary_grub ${*} +lh_binary_syslinux ${*} +lh_binary_yaboot ${*} +lh_binary_includes ${*} +lh_binary_localincludes ${*} +lh_binary_md5sum ${*} # Building images -lh_binary_hdd "${@}" -lh_binary_iso "${@}" -lh_binary_net "${@}" -lh_binary_usb-hdd "${@}" +lh_binary_hdd ${*} +lh_binary_iso ${*} +lh_binary_net ${*} +lh_binary_usb-hdd ${*} # Deconfiguring chroot rm -f .stage/chroot_sources -lh_chroot_resolv remove "${@}" -lh_chroot_hosts remove "${@}" -lh_chroot_sysfs remove "${@}" -lh_chroot_proc remove "${@}" +lh_chroot_resolv remove ${*} +lh_chroot_hosts remove ${*} +lh_chroot_sysfs remove ${*} +lh_chroot_proc remove ${*} diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 6d6d784..b5927a0 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -109,6 +109,8 @@ then 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 +FIXME () +{ # Downloading udebs mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}" cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}" @@ -234,6 +236,7 @@ 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 diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index 15d898d..4a1bc93 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -83,7 +83,7 @@ then # Working arround vfat limitations if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ] then - CP_OPTIONS="--preserve=link,mode,timestamps" + CP_OPTIONS="-L" fi # Copying d-i templates @@ -112,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_localincludes b/helpers/lh_binary_localincludes index 2c1f752..66504c1 100755 --- a/helpers/lh_binary_localincludes +++ b/helpers/lh_binary_localincludes @@ -53,6 +53,12 @@ then find . | cpio -dmpu "${OLDPWD}"/binary cd "${OLDPWD}" + # Removing symlinks + if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ] + then + find binary -type l | xargs rm -f + fi + # Creating stage file Create_stagefile .stage/binary_localincludes fi diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index 8a8f144..e643966 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -77,7 +77,7 @@ do # 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... + REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here... dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM} FREELO="`${LH_LOSETUP} -f`" if [ ! -b chroot/${FREELO} ] diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index 733fad3..36a7a0a 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -38,5 +38,5 @@ Read_conffile config/source Set_defaults # Bootstrapping system -lh_bootstrap_cdebootstrap "${@}" -lh_bootstrap_debootstrap "${@}" +lh_bootstrap_cdebootstrap ${*} +lh_bootstrap_debootstrap ${*} diff --git a/helpers/lh_build b/helpers/lh_build index 20ae36d..e2cef4c 100755 --- a/helpers/lh_build +++ b/helpers/lh_build @@ -26,13 +26,13 @@ Echo_debug "Init ${PROGRAM}" Breakpoint "build: Init" # Bootstrapping system -lh_bootstrap "${@}" +lh_bootstrap ${*} # Customizing chroot -lh_chroot "${@}" +lh_chroot ${*} # Building binary image -lh_binary "${@}" +lh_binary ${*} # Building source image -lh_source "${@}" +lh_source ${*} diff --git a/helpers/lh_chroot b/helpers/lh_chroot index ed40c33..451a6b4 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -35,38 +35,38 @@ Set_defaults Breakpoint "chroot: Init" # Configuring chroot -lh_chroot_proc install "${@}" -lh_chroot_sysfs install "${@}" -lh_chroot_debianchroot install "${@}" -lh_chroot_sysvrc install "${@}" -lh_chroot_hosts install "${@}" -lh_chroot_resolv install "${@}" -lh_chroot_apt install "${@}" -lh_chroot_sources install "${@}" -lh_chroot_linuximage install "${@}" +lh_chroot_proc install ${*} +lh_chroot_sysfs install ${*} +lh_chroot_debianchroot install ${*} +lh_chroot_sysvrc install ${*} +lh_chroot_hosts install ${*} +lh_chroot_resolv install ${*} +lh_chroot_apt install ${*} +lh_chroot_sources install ${*} +lh_chroot_linuximage install ${*} # Customizing chroot -lh_chroot_tasks "${@}" -lh_chroot_packageslists "${@}" -lh_chroot_packages "${@}" -lh_chroot_localpackages "${@}" -lh_chroot_localpackageslists "${@}" -lh_chroot_localization "${@}" -lh_chroot_localincludes "${@}" -lh_chroot_sysvinit "${@}" -lh_chroot_hooks "${@}" -lh_chroot_localhooks "${@}" -lh_chroot_symlinks "${@}" -lh_chroot_hacks "${@}" -lh_chroot_interactive "${@}" +lh_chroot_tasks ${*} +lh_chroot_packageslists ${*} +lh_chroot_packages ${*} +lh_chroot_localpackages ${*} +lh_chroot_localpackageslists ${*} +lh_chroot_localization ${*} +lh_chroot_localincludes ${*} +lh_chroot_sysvinit ${*} +lh_chroot_hooks ${*} +lh_chroot_localhooks ${*} +lh_chroot_symlinks ${*} +lh_chroot_hacks ${*} +lh_chroot_interactive ${*} # Deconfiguring chroot -lh_chroot_linuximage remove "${@}" -lh_chroot_sources remove "${@}" -lh_chroot_apt remove "${@}" -lh_chroot_resolv remove "${@}" -lh_chroot_hosts remove "${@}" -lh_chroot_sysvrc remove "${@}" -lh_chroot_debianchroot remove "${@}" -lh_chroot_sysfs remove "${@}" -lh_chroot_proc remove "${@}" +lh_chroot_linuximage remove ${*} +lh_chroot_sources remove ${*} +lh_chroot_apt remove ${*} +lh_chroot_resolv remove ${*} +lh_chroot_hosts remove ${*} +lh_chroot_sysvrc remove ${*} +lh_chroot_debianchroot remove ${*} +lh_chroot_sysfs remove ${*} +lh_chroot_proc remove ${*} diff --git a/helpers/lh_config b/helpers/lh_config index 3b4f940..8e9e117 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -158,23 +158,23 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}" # \$LH_BREAKPOINTS: enable breakpoints # (Default: ${LH_BREAKPOINTS}) -LH_BREAKPOINTS="${LH_BREAKPOINTS}" +#LH_BREAKPOINTS="${LH_BREAKPOINTS}" # \$LH_DEBUG: enable debug # (Default: ${LH_DEBUG}) -LH_DEBUG="${LH_DEBUG}" +#LH_DEBUG="${LH_DEBUG}" # \$LH_FORCE: enable force # (Default: ${LH_FORCE}) -LH_FORCE="${LH_FORCE}" +#LH_FORCE="${LH_FORCE}" # \$LH_QUIET: enable quiet # (Default: ${LH_QUIET}) -LH_QUIET="${LH_QUIET}" +#LH_QUIET="${LH_QUIET}" # \$LH_VERBOSE: enable verbose # (Default: ${LH_VERBOSE}) -LH_VERBOSE="${LH_VERBOSE}" +#LH_VERBOSE="${LH_VERBOSE}" EOF # Creating lh_chroot_* configuration diff --git a/helpers/lh_source b/helpers/lh_source index a595569..ff5df20 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -35,23 +35,23 @@ Set_defaults Breakpoint "source: Init" # Enabling network in chroot -lh_chroot_hosts install "${@}" -lh_chroot_resolv install "${@}" -lh_chroot_sources install "${@}" +lh_chroot_hosts install ${*} +lh_chroot_resolv install ${*} +lh_chroot_sources install ${*} # Preparing images -lh_source_config "${@}" -lh_source_download "${@}" -lh_source_md5sum "${@}" +lh_source_config ${*} +lh_source_download ${*} +lh_source_md5sum ${*} # Building images -lh_source_generic "${@}" -lh_source_hdd "${@}" -lh_source_iso "${@}" -lh_source_net "${@}" -lh_source_usb-hdd "${@}" +lh_source_generic ${*} +lh_source_hdd ${*} +lh_source_iso ${*} +lh_source_net ${*} +lh_source_usb-hdd ${*} # Deconfiguring chroot rm -f .stage/chroot_sources -lh_chroot_resolv remove "${@}" -lh_chroot_hosts remove "${@}" +lh_chroot_resolv remove ${*} +lh_chroot_hosts remove ${*} diff --git a/helpers/lh_source_download b/helpers/lh_source_download index 050dc4d..cdae2c9 100755 --- a/helpers/lh_source_download +++ b/helpers/lh_source_download @@ -60,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_usb-hdd b/helpers/lh_source_usb-hdd index 7cc7c23..4eca22a 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -70,7 +70,7 @@ do # 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... + REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here... dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM} FREELO="`${LH_LOSETUP} -f`" if [ ! -b chroot/${FREELO} ] diff --git a/manpages/lh_binary.1.de b/manpages/lh_binary.1.de index 7ae347e..ffd6759 100644 --- a/manpages/lh_binary.1.de +++ b/manpages/lh_binary.1.de @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_BINARY 1 "07.05.2007" "1.0~a9" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* diff --git a/manpages/lh_binary.1.en b/manpages/lh_binary.1.en index 3f5ba5b..0d2bb45 100644 --- a/manpages/lh_binary.1.en +++ b/manpages/lh_binary.1.en @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_BINARY 1 "2007\-05\-07" "1.0~a9" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* diff --git a/manpages/lh_bootstrap.1.de b/manpages/lh_bootstrap.1.de index 138fea2..44269c1 100644 --- a/manpages/lh_bootstrap.1.de +++ b/manpages/lh_bootstrap.1.de @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_BOOTSTRAP 1 "07.05.2007" "1.0~a9" "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 4a9552c..af9d414 100644 --- a/manpages/lh_bootstrap.1.en +++ b/manpages/lh_bootstrap.1.en @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "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 ad0db4a..7ef881d 100644 --- a/manpages/lh_bootstrap_cdebootstrap.1.de +++ b/manpages/lh_bootstrap_cdebootstrap.1.de @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "07.05.2007" "1.0~a9" "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 a5c4f38..7737c51 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\-30" "1.0~a8" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "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 9efa212..7dbbfec 100644 --- a/manpages/lh_bootstrap_debootstrap.1.de +++ b/manpages/lh_bootstrap_debootstrap.1.de @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "07.05.2007" "1.0~a9" "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 ec209bb..e26dc02 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\-30" "1.0~a8" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "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 d0d6b24..ca95cf2 100644 --- a/manpages/lh_build.1.de +++ b/manpages/lh_build.1.de @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_BUILD 1 "07.05.2007" "1.0~a9" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes diff --git a/manpages/lh_build.1.en b/manpages/lh_build.1.en index 340df4c..a8be3e0 100644 --- a/manpages/lh_build.1.en +++ b/manpages/lh_build.1.en @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_BUILD 1 "2007\-05\-07" "1.0~a9" "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 0063068..cec3342 100644 --- a/manpages/lh_chroot.1.de +++ b/manpages/lh_chroot.1.de @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_CHROOT 1 "07.05.2007" "1.0~a9" "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 8ffc2c2..9b8322d 100644 --- a/manpages/lh_chroot.1.en +++ b/manpages/lh_chroot.1.en @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_CHROOT 1 "2007\-05\-07" "1.0~a9" "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 8c1b40d..f6fe1a8 100644 --- a/manpages/lh_clean.1.de +++ b/manpages/lh_clean.1.de @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_CLEAN 1 "07.05.2007" "1.0~a9" "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 c631181..d9eb998 100644 --- a/manpages/lh_clean.1.en +++ b/manpages/lh_clean.1.en @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_CLEAN 1 "2007\-05\-07" "1.0~a9" "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 35dba18..e5f38e9 100644 --- a/manpages/lh_source.1.de +++ b/manpages/lh_source.1.de @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_SOURCE 1 "07.05.2007" "1.0~a9" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* diff --git a/manpages/lh_source.1.en b/manpages/lh_source.1.en index b52c665..dfa0848 100644 --- a/manpages/lh_source.1.en +++ b/manpages/lh_source.1.en @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_SOURCE 1 "2007\-05\-07" "1.0~a9" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* diff --git a/manpages/lh_testroot.1.de b/manpages/lh_testroot.1.de index a1be8b4..a49cbb9 100644 --- a/manpages/lh_testroot.1.de +++ b/manpages/lh_testroot.1.de @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH LH_TESTROOT 1 "07.05.2007" "1.0~a9" "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 c6aae69..44b0f92 100644 --- a/manpages/lh_testroot.1.en +++ b/manpages/lh_testroot.1.en @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LH_TESTROOT 1 "2007\-05\-07" "1.0~a9" "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 45e0286..33159ca 100644 --- a/manpages/live-helper.7.de +++ b/manpages/live-helper.7.de @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "30.04.2007" "1.0~a8" "live\-helper" +.TH LIVE\-HELPER 7 "07.05.2007" "1.0~a9" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme diff --git a/manpages/live-helper.7.en b/manpages/live-helper.7.en index ce7699f..9d795df 100644 --- a/manpages/live-helper.7.en +++ b/manpages/live-helper.7.en @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-05\-07" "1.0~a9" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs diff --git a/manpages/make-live.1.de b/manpages/make-live.1.de index dd45349..61beb62 100644 --- a/manpages/make-live.1.de +++ b/manpages/make-live.1.de @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "30.04.2007" "1.0~a8" "live\-helper" +.TH MAKE\-LIVE 1 "07.05.2007" "1.0~a9" "live\-helper" .SH NAME make\-live \- erstellt ein Debian Live-System diff --git a/manpages/make-live.1.en b/manpages/make-live.1.en index a142a02..3555333 100644 --- a/manpages/make-live.1.en +++ b/manpages/make-live.1.en @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "2007\-04\-30" "1.0~a8" "live\-helper" +.TH MAKE\-LIVE 1 "2007\-05\-07" "1.0~a9" "live\-helper" .SH NAME make\-live \- build a Debian Live system diff --git a/templates/syslinux/f1.txt b/templates/syslinux/f1.txt index b54d5f3..2e8656c 100644 --- a/templates/syslinux/f1.txt +++ b/templates/syslinux/f1.txt @@ -10,7 +10,7 @@ It was built on LIVE_DATE. <09F107> This page, the help index. <09F207> Prerequisites for installing Debian. <09F307> Boot methods for special ways of using this CD-ROM -<09F407> Additional boot methods; rescue mode. +<09F407> Additional boot methods; live and rescue modes. <09F507> Special boot parameters, overview. <09F607> Special boot parameters for special machines. <09F707> Special boot parameters for selected disk controllers. diff --git a/templates/syslinux/f3.txt b/templates/syslinux/f3.txt index 9cd2ba5..5f3996f 100644 --- a/templates/syslinux/f3.txt +++ b/templates/syslinux/f3.txt @@ -4,7 +4,7 @@ 0fAvailable boot methods:07 0finstall07 - Start the installation -- this is the default CD-ROM install. + Start the installation. 0finstallgui07 Start the installation using the graphical installer. 0fexpert07 @@ -20,4 +20,4 @@ followed by any boot parameters. For example: 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
\ No newline at end of file +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f4.txt b/templates/syslinux/f4.txt index c2cf4f4..1167738 100644 --- a/templates/syslinux/f4.txt +++ b/templates/syslinux/f4.txt @@ -1,6 +1,13 @@ - 0fRESCUE MODE07 09F407 + 0fLIVE AND RESCUE MODES07 09F407 +0fUse one of these boot methods to start the live system07 + +0flive07 + Start the live system in standard mode -- this is the default. +0flive-failsafe07 + Start the live system in failsafe mode. + 0fUse one of these boot methods to rescue an existing install07 0frescue07 @@ -8,16 +15,9 @@ 0frescuegui07 Boot into rescue mode using the graphical installer. +0fmemtest07 + Run memtest86+ (memory tester). +0ffloppy07, 0fdisk107 or 0fdisk207 + Boot from the floppy, first or second hard disk. - - - - - -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 +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg index 7697831..c44e657 100644 --- a/templates/syslinux/isolinux.cfg +++ b/templates/syslinux/isolinux.cfg @@ -20,5 +20,17 @@ LIVE_KERNEL_INSTALL LIVE_MEMTEST +#LABEL floppy +# localboot 0x00 + +#LABEL disk1 +# localboot 0x80 + +#LABEL disk2 +# localboot 0x81 + +#LABEL nextboot +# localboot -1 + PROMPT 1 TIMEOUT 0 |