diff options
39 files changed, 179 insertions, 59 deletions
@@ -91,9 +91,9 @@ uninstall: update: set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-07\\-23/2007\\-07\\-30/' \ - -e 's/23.07.2007/30.07.2007/' \ - -e 's/1.0~a20/1.0~a21/' \ + sed -i -e 's/2007\\-07\\-30/2007\\-08\\-06/' \ + -e 's/30.07.2007/06.08.2007/' \ + -e 's/1.0~a21/1.0~a22/' \ $$FILE; \ done diff --git a/debian/changelog b/debian/changelog index 7cff069..4b0e256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +live-helper (1.0~a21-1) unstable; urgency=medium + + * New upstream release: + - Suppresses xorg configuration in chroot (Closes: #430566). + + -- Daniel Baumann <daniel@debian.org> Mon, 30 Jul 2007 00:00:00 +0200 + live-helper (1.0~a20-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 47c3255..2ab9c08 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: live-helper Section: misc Priority: optional -Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org> -Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmail.com> +Maintainer: Debian Live <debian-live-maint@lists.alioth.debian.org> +Uploaders: Daniel Baumann <daniel@debian.org> Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-helper/ @@ -10,8 +10,8 @@ XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/ Package: live-helper Architecture: all -Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2) -Suggests: genisoimage | mkisofs, memtest86+ | memtest86, mtools, squashfs-tools | genext2fs, syslinux | grub +Depends: cdebootstrap | debootstrap +Suggests: dosfstools, genisoimage | mkisofs, memtest86+ | memtest86, mtools, parted, squashfs-tools | genext2fs, syslinux | grub Description: Debian Live helper programs Live-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live-helper is to provide a collection of diff --git a/docs/AUTHORS b/docs/AUTHORS index ce0a01a..908a12e 100644 --- a/docs/AUTHORS +++ b/docs/AUTHORS @@ -1,4 +1,3 @@ Main Authors: * Daniel Baumann <daniel@debian.org> - * Marco Amadori <marco.amadori@gmail.com> diff --git a/docs/ChangeLog b/docs/ChangeLog index 84dc5b6..fc54291 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,19 @@ +2007-07-29 Daniel Baumann <daniel@debian.org> + + * functions/packages.sh: + - Using dpkg-query to check for packages when building in chroot, + and on systems where dpkg-query is available. + * functions/stagefile.sh: + - Added missing NAME. + +2007-07-28 Daniel Baumann <daniel@debian.org> + + * functions/chroot.sh: + - Added XORG_CONFIG="custom" to chroot call in order to disable + xserver-xorg.postinst (Closes: #430566). + * helpers/lh_binary_usb-hdd: + - Fixes for binary non-chroot build. + 2007-07-27 Daniel Baumann <daniel@debian.org> * Makefile, debian/postinst, prerm: @@ -12,6 +28,13 @@ * templates/syslinux: - Added installer specific templates. - Renamebled additional boot targets (localboot). + * Uploaded 1.0~a20-1. + +2007-07-24 Mathieu Geli <mathieu.geli@gmail.com> + + * helpers/make-live: + - synced usage message and getopts parsing (Closes and extends + #434481). 2007-07-19 Daniel Baumann <daniel@debian.org> diff --git a/functions/chroot.sh b/functions/chroot.sh index 4b9e850..12c49b6 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -15,7 +15,7 @@ Chroot () # Executing commands in chroot Echo_debug "Executing: ${COMMANDS}" - ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS} + ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS} return "${?}" } diff --git a/functions/common.sh b/functions/common.sh index d9d63a7..19abcbb 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a20" +VERSION="1.0~a21" diff --git a/functions/package.sh b/functions/packages.sh index 96316dc..049c89b 100755 --- a/functions/package.sh +++ b/functions/packages.sh @@ -11,24 +11,38 @@ set -e Check_package () { - ITEM="${1}" + FILE="${1}" PACKAGE="${2}" case "${LIVE_CHROOT_BUILD}" in enabled) - if [ ! -d "${ITEM}" ] && [ ! -f "${ITEM}" ] - then - PACKAGES="${PACKAGES} ${PACKAGE}" - fi + for ITEM in ${PACKAGE} + do + if ! `Chroot "dpkg-query -s ${ITEM}"` + then + PACKAGES="${PACKAGES} ${ITEM}" + fi + done ;; disabled) - ITEM="`echo ${ITEM} | sed -e 's/chroot//'`" - - if [ ! -d "${ITEM}" ] && [ ! -f "${ITEM}" ] + if `which dpkg-query` then - Echo_error "You need to install ${PACKAGE} on your host system." - exit 1 + for ITEM in ${PACKAGE} + do + if ! `dpkg-query -s ${ITEM}` + then + PACKAGES="${PACKAGES} ${ITEM}" + fi + done + else + FILE="`echo ${FILE} | sed -e 's/chroot//'`" + + if [ ! -f "${FILE}" ] && [ ! -d "${FILE}" ] + then + Echo_error "You need to install ${PACKAGE} on your host system." + exit 1 + fi fi ;; esac diff --git a/functions/packagelist.sh b/functions/packageslists.sh index f25b5fb..f25b5fb 100755 --- a/functions/packagelist.sh +++ b/functions/packageslists.sh diff --git a/functions/stagefile.sh b/functions/stagefile.sh index 2606983..647b181 100755 --- a/functions/stagefile.sh +++ b/functions/stagefile.sh @@ -44,6 +44,7 @@ Create_stagefile () Require_stagefile () { + NAME="`basename ${0}`" FILES="${@}" NUMBER="`echo ${@} | wc -w`" @@ -59,11 +60,11 @@ Require_stagefile () if [ "${CONTINUE}" != "true" ] then - if [ "${NUMBER}" -gt 1 ] + if [ "${NUMBER}" -eq 1 ] then - Echo_error "one of ${NAME} is missing" - else Echo_error "${NAME} missing" + else + Echo_error "one of ${NAME} is missing" fi exit 1 diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index 6d13bad..8bf6125 100755 --- a/helpers/lh_binary_chroot +++ b/helpers/lh_binary_chroot @@ -33,7 +33,6 @@ Read_conffile config/source Set_defaults Echo_message "Begin copying chroot..." -Echo_message "This may take a while." # Requiring stage file Require_stagefile .stage/bootstrap @@ -63,6 +62,8 @@ then exit 0 fi +Echo_message "This may take a while." + # Removing old chroot ${LH_ROOT_COMMAND} rm -rf chroot/chroot ${LH_ROOT_COMMAND} rm -rf chroot.tmp diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index 7a5055b..af4048c 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -54,7 +54,7 @@ Create_lockfile .lock # Checking depends Check_package chroot/sbin/mkdosfs dosfstools -Check_package chroot/usr/sbin/mtools mtools +Check_package chroot/usr/share/doc/mtools mtools Check_package chroot/sbin/parted parted case "${LIVE_BOOTLOADER}" in @@ -94,21 +94,48 @@ fi echo "!!! The following error/warning messages can be ignored !!!" lh_losetup $FREELO chroot/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 -if [ "${LIVE_BOOTLOADER}" = "syslinux" ] -then - cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO} -fi +case "${LIVE_CHROOT_BUILD}" in + enabled) + 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 + + if [ "${LIVE_BOOTLOADER}" = "syslinux" ] + then + cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO} + fi + ;; + + disabled) + parted -s ${FREELO} mklabel msdos || true + parted -s ${FREELO} mkpartfs primary fat16 0.0 100% || true + parted -s ${FREELO} set 1 boot on || true + parted -s ${FREELO} set 1 lba off || true + + if [ "${LIVE_BOOTLOADER}" = "syslinux" ] + then + cat /usr/lib/syslinux/mbr.bin > ${FREELO} + fi + ;; +esac ${LH_LOSETUP} -d ${FREELO} FREELO="`${LH_LOSETUP} -f`" lh_losetup $FREELO chroot/binary.img 1 -Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}" + +case "${LIVE_CHROOT_BUILD}" in + enabled) + Chroot "mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}" + ;; + + disabled) + mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO} + ;; +esac + mkdir -p chroot/binary.tmp ${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp cp -rL binary/* chroot/binary.tmp @@ -149,7 +176,15 @@ rmdir chroot/binary.tmp if [ "${LIVE_BOOTLOADER}" = "syslinux" ] then - Chroot "syslinux ${FREELO}" + case "${LIVE_CHROOT_BUILD}" in + enabled) + Chroot "syslinux ${FREELO}" + ;; + + disabled) + syslinux ${FREELO} + ;; + esac fi ${LH_LOSETUP} -d ${FREELO} diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 60ecade..31ffc77 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -39,6 +39,8 @@ fi Echo_message "Begin bootstrapping system..." +Check_package /usr/bin/cdebootstrap cdebootstrap + # Ensure that a system is built as root lh_testroot diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index b4307a1..4c0fd6e 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -39,6 +39,8 @@ fi Echo_message "Begin bootstrapping system..." +Check_package /usr/sbin/debootstrap debootstrap + # Ensure that a system is built as root lh_testroot diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index cba5441..cc9b431 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -86,9 +86,6 @@ Chroot "update-initramfs -k all -t -u" # Remove build systems clock drift echo "0.0 0 0.0" > chroot/etc/adjtime -# Remove generated xorg.conf based on build systems configuration -rm -f chroot/etc/X11/xorg.conf - # Remove cruft rm -f chroot/boot/initrd*bak* rm -f /etc/apt/trusted.gpg~ diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index f4b14f5..9d255f9 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -217,6 +217,9 @@ case "${1}" in if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \ [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ] then + # Removing stage file + rm -f .stage/chroot_sources + exit 0 fi diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian index 4ec0a56..09ddd43 100755 --- a/helpers/lh_source_debian +++ b/helpers/lh_source_debian @@ -60,7 +60,20 @@ 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 -e "live-helper\n${LH_INITRAMFS}" >> chroot/root/dpkg-selection.txt +echo -e "dosfstools\n${LH_GENISOIMAGE}\nparted\nsquashfs-tools\ngenext2fs" >> chroot/root/dpkg-selection.txt + +case "${LIVE_ARCHITECTURE}" in + amd64|i386) + echo -e "${LIVE_MEMTEST}\nmtools\nsyslinux\ngrub" >> chroot/root/dpkg-selection.txt + ;; + + powerpc) + echo -e "yaboot" >> chroot/root/dpkg-selection.txt + ;; +esac + Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only" rm -f chroot/root/dpkg-selection.txt diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1 index 1e39cc8..0d38ec7 100644 --- a/manpages/lh_binary.de.1 +++ b/manpages/lh_binary.de.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_BINARY 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1 index f0648c5..3347efb 100644 --- a/manpages/lh_binary.en.1 +++ b/manpages/lh_binary.en.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_BINARY 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1 index 20823df..ef974e4 100644 --- a/manpages/lh_bootstrap.de.1 +++ b/manpages/lh_bootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_BOOTSTRAP 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1 index 447b8d0..e7a377d 100644 --- a/manpages/lh_bootstrap.en.1 +++ b/manpages/lh_bootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_bootstrap \- meta\-helper for lh_bootstrap_* diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1 index 65c3244..5e05fb9 100644 --- a/manpages/lh_bootstrap_cdebootstrap.de.1 +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1 index 531909f..d6368d3 100644 --- a/manpages/lh_bootstrap_cdebootstrap.en.1 +++ b/manpages/lh_bootstrap_cdebootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1 index bcc267a..c3e848b 100644 --- a/manpages/lh_bootstrap_debootstrap.de.1 +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1 index b552658..ada7137 100644 --- a/manpages/lh_bootstrap_debootstrap.en.1 +++ b/manpages/lh_bootstrap_debootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1 index a5aa4ce..6fb578d 100644 --- a/manpages/lh_build.de.1 +++ b/manpages/lh_build.de.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_BUILD 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1 index 1d7ebcf..8bcd527 100644 --- a/manpages/lh_build.en.1 +++ b/manpages/lh_build.en.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_BUILD 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_build \- building a live system diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1 index dc290a4..93100f0 100644 --- a/manpages/lh_chroot.de.1 +++ b/manpages/lh_chroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_CHROOT 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1 index 87361c4..ff3f8e7 100644 --- a/manpages/lh_chroot.en.1 +++ b/manpages/lh_chroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_CHROOT 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_chroot \- meta\-helper for lh_chroot_* diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1 index 6c87f0f..377325b 100644 --- a/manpages/lh_clean.de.1 +++ b/manpages/lh_clean.de.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_CLEAN 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_clean \- r\[:a]umt das Build-Verzeichnis auf diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1 index e52a94b..1b8a11e 100644 --- a/manpages/lh_clean.en.1 +++ b/manpages/lh_clean.en.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_CLEAN 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_clean \- clean up system build directories diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1 index 0c90d40..37815c7 100644 --- a/manpages/lh_source.de.1 +++ b/manpages/lh_source.de.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_SOURCE 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1 index a2c37a5..2172440 100644 --- a/manpages/lh_source.en.1 +++ b/manpages/lh_source.en.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_SOURCE 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1 index b5fe723..810c606 100644 --- a/manpages/lh_testroot.de.1 +++ b/manpages/lh_testroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "23.07.2007" "1.0~a20" "live\-helper" +.TH LH_TESTROOT 1 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME lh_testroot \- stellt sicher dass das System als root gebaut wird diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1 index 065dcfa..c748a07 100644 --- a/manpages/lh_testroot.en.1 +++ b/manpages/lh_testroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LH_TESTROOT 1 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME lh_testroot \- ensure that a system is built as root diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7 index f44c6f3..766ee0d 100644 --- a/manpages/live-helper.de.7 +++ b/manpages/live-helper.de.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "23.07.2007" "1.0~a20" "live\-helper" +.TH LIVE\-HELPER 7 "30.07.2007" "1.0~a21" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7 index e799a75..725a8f5 100644 --- a/manpages/live-helper.en.7 +++ b/manpages/live-helper.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-07\-23" "1.0~a20" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-07\-30" "1.0~a21" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs diff --git a/templates/syslinux/f8.txt b/templates/syslinux/f8.txt.install index bc40696..bc40696 100644 --- a/templates/syslinux/f8.txt +++ b/templates/syslinux/f8.txt.install diff --git a/templates/syslinux/f8.txt.live b/templates/syslinux/f8.txt.live new file mode 100644 index 0000000..faffb80 --- /dev/null +++ b/templates/syslinux/f8.txt.live @@ -0,0 +1,23 @@ + 0fSPECIAL BOOT PARAMETERS07 09F807 + + + + + + + + + + + + + + + + + + + + + +Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT} |