diff options
71 files changed, 598 insertions, 398 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\\-16/2007\\-07\\-23/' \ - -e 's/16.07.2007/23.07.2007/' \ - -e 's/1.0~a19/1.0~a20/' \ + 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/' \ $$FILE; \ done diff --git a/data/casper/parameters.txt b/data/casper/parameters.txt deleted file mode 100644 index 10904be..0000000 --- a/data/casper/parameters.txt +++ /dev/null @@ -1,29 +0,0 @@ -Boot Parameters for Debian Live -------------------------------- - -Updated for casper 1.77+debian-7 on 2007-02-08. - -These options (can be combined) work from the syslinux bootprompt: - -casper casper-getty -casper xdebconf -casper hostname=HOSTNAME -casper userfullname=USERFULLNAME -casper username=USERNAME -casper {keyb|kbd-chooser/method}=KEYBOARD -casper {klayout|console-setup/layoutcode}=LAYOUT -casper {kvariant|console-setup/variantcode}=VARIANT , -casper {kmodel|console-setup/modelcode}=CODE , koptions=OPTIONS -casper ip=IFACE,ADDRESS,NETMASK,GATEWAY[:IFACE,ADDRESS,NETMASK,GATEWAY]* -casper ip[=frommedia] -casper {live-media|bootfrom}=DEVICE -casper live-media-offset=BYTES -casper locale=LOCALE | debian-installer/locale=LOCALE -casper netboot[=nfs|cifs] -casper persistent -casper nopersistent -casper showmounts -casper todisk=DEVICE -casper toram -casper {preseed/file|file}=FILE -casper package/question=VALUE diff --git a/debian/changelog b/debian/changelog index e67f5b0..7cff069 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-helper (1.0~a20-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 23 Jul 2007 00:00:00 +0200 + live-helper (1.0~a19-1) unstable; urgency=medium * New upstream release: diff --git a/debian/control b/debian/control index 04fa651..47c3255 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,6 @@ 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 -Conflicts: live-package -Replaces: live-package -Provides: make-live 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 @@ -22,7 +19,6 @@ Description: Debian Live helper programs to automate building of a Live system. . A typical program that uses live-helper will call several live-helper commands - in sequence. Live-helper commands are all named with a "lh_" prefix. Examples - of such a program that uses live-helper is make-live (included here). + in sequence. Live-helper commands are all named with a "lh_" prefix. . Homepage: <http://debian-live.alioth.debian.org/> diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..9137a2c --- /dev/null +++ b/debian/postinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +case "${1}" in + configure) + update-alternatives --install /usr/share/live-helper/templates \ + live-helper_templates \ + /usr/share/live-helper/templates.debian 100 + + update-alternatives --install /usr/share/live-helper/includes \ + live-helper_includes \ + /usr/share/live-helper/includes.debian 100 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..e30345b --- /dev/null +++ b/debian/prerm @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +case "${1}" in + remove|upgrade|deconfigure) + update-alternatives --remove live-helper_includes /usr/share/live-helper/includes.debian + update-alternatives --remove live-helper_templates /usr/share/live-helper/templates.debian + ;; + + failed-upgrade) + + ;; + + *) + echo "prerm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 83011f5..92b7fff 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,10 @@ install: build install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper + # Preparing alternatives + mv debian/live-helper/usr/share/live-helper/includes debian/live-helper/usr/share/live-helper/includes.debian + mv debian/live-helper/usr/share/live-helper/templates debian/live-helper/usr/share/live-helper/templates.debian + # Removing double files rm -f debian/live-helper/usr/share/doc/live-helper/COPYING rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog diff --git a/docs/ChangeLog b/docs/ChangeLog index a538403..84dc5b6 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,18 @@ +2007-07-27 Daniel Baumann <daniel@debian.org> + + * Makefile, debian/postinst, prerm: + - Added alternatives handling for includes and templates. + * examples/hooks/*: + - Cleaned up. + * helpers/lh_chroot_preseed: + - Process flavour specific preseeds, if available, dropping + LIVE_PRESEED. + * helpers/lh_chroot_local-preseed: + - Added. + * templates/syslinux: + - Added installer specific templates. + - Renamebled additional boot targets (localboot). + 2007-07-19 Daniel Baumann <daniel@debian.org> * functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*: diff --git a/examples/hooks/ipw2100.sh b/examples/hooks/ipw2100.sh index fc9e033..6fc3669 100755 --- a/examples/hooks/ipw2100.sh +++ b/examples/hooks/ipw2100.sh @@ -2,14 +2,9 @@ # This is a hook for live-helper(7) to install ipw2100 drivers # To enable it, copy this hook into your config/chroot_local-hooks directory. - -# IMPORTANT: for apt-get to locate the required packages you need to -# add "contrib" sections and the 686 flavour. # -# e.g with make-live : --sections "main contrib" --kernel-flavour 686 - -# Updating indices -apt-get update +# Note: This hook requires packages from the contrib section. Make sure you enabled +# it in your configuration. # Building kernel module which module-assistant || apt-get install --yes module-assistant @@ -18,7 +13,6 @@ module-assistant --non-inter --quiet auto-install ipw2100 module-assistant clean ipw2100 # Installing firmware (http://ipw2100.sourceforge.net/firmware.php) -# grabbing 0.55 (Wed May 16 15:17:38 -- matth) wget --referer "http://ipw2100.sourceforge.net/firmware.php" "http://ipw2100.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2100-fw-1.3.tgz" -O /tmp/ipw2100-fw-1.3.tgz cd /tmp diff --git a/examples/hooks/ipw2200.sh b/examples/hooks/ipw2200.sh index fd2fc99..47281a4 100755 --- a/examples/hooks/ipw2200.sh +++ b/examples/hooks/ipw2200.sh @@ -2,14 +2,9 @@ # This is a hook for live-helper(7) to install nvidia-legacy drivers # To enable it, copy this hook into your config/chroot_local-hooks directory. - -# IMPORTANT: for apt-get to locate the required packages you need to -# add "contrib" sections and the 686 flavour. # -# e.g with make-live : --sections "main contrib" --kernel-flavour 686 - -# Updating indices -apt-get update +# Note: This hook requires packages from the contrib section. Make sure you enabled +# it in your configuration. # Building kernel mdoule which module-assistant || apt-get install --yes module-assistant @@ -18,7 +13,6 @@ module-assistant --non-inter --quiet auto-install ipw2200 module-assistant clean ipw2200 # Installing firmware (http://ipw2200.sourceforge.net/firmware.php) -# grabbing 3.0 (Wed May 16 15:17:38 -- matth) wget --referer "http://ipw2200.sourceforge.net/firmware.php" "http://ipw2200.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2200-fw-3.0.tgz" -O /tmp/ipw2200-fw-3.0.tgz cd /tmp diff --git a/examples/hooks/ipw3945.sh b/examples/hooks/ipw3945.sh index 04d235b..18a977b 100755 --- a/examples/hooks/ipw3945.sh +++ b/examples/hooks/ipw3945.sh @@ -2,22 +2,20 @@ # This is a hook for live-helper(7) to install ipw3945 drivers # To enable it, copy this hook into your config/chroot_local-hooks directory. - -# IMPORTANT: for apt-get to locate the required packages you need to -# add "non-free" sections # -# e.g with make-live : --sections "main non-free" - -# Updating indices -apt-get update +# Note: This hook requires packages from the contrib and non-free section. Make +# sure you enabled it in your configuration. +# +# FIXME: it runs in interactive mode # Building kernel module which module-assistant || apt-get install --yes module-assistant module-assistant update -module-assistant auto-install ipw3945 # interactive mode for now +module-assistant auto-install ipw3945 module-assistant clean ipw3945 -apt-get install ipw3945d firmware-ipw3945 +# Installing additional stuff +apt-get install firmware-ipw3945 ipw3945d # hackish, autorun regulatory daemon, update-rc.d will reject that ln -s /etc/init.d/ipw3945d /etc/rc2.d/S19ipw3945d diff --git a/examples/hooks/madwifi.sh b/examples/hooks/madwifi.sh index f45b968..178de88 100755 --- a/examples/hooks/madwifi.sh +++ b/examples/hooks/madwifi.sh @@ -2,16 +2,11 @@ # This is a hook for live-helper(7) to install madwifi drivers # To enable it, copy this hook into your config/chroot_localhooks directory. - -# IMPORTANT: for apt-get to locate the required packages you need to -# add "non-free" sections # -# e.g with make-live : --sections "main non-free" - -# NOTE: it runs in interactive mode - -# Updating indices -apt-get update +# Note: This hook requires packages from the contrib section. Make sure you enabled +# it in your configuration. +# +# FIXME: it runs in interactive mode # Building kernel module which module-assistant || apt-get install --yes module-assistant @@ -19,5 +14,5 @@ module-assistant update module-assistant auto-install madwifi module-assistant clean madwifi -# Installing aditional stuff +# Installing additional stuff apt-get install --yes madwifi-tools madwifi-doc diff --git a/examples/hooks/nvidia-legacy.sh b/examples/hooks/nvidia-legacy.sh index cc1ceb4..0dc3c6e 100755 --- a/examples/hooks/nvidia-legacy.sh +++ b/examples/hooks/nvidia-legacy.sh @@ -2,14 +2,9 @@ # This is a hook for live-helper(7) to install nvidia-legacy drivers # To enable it, copy this hook into your config/chroot_localhooks directory. - -# IMPORTANT: for apt-get to locate the required packages you need to -# add "contrib non-free" sections. # -# e.g with make-live : --sections "main contrib non-free" - -# Updating indices -apt-get update +# Note: This hook requires packages from the non-free section. Make sure you +# enabled it in your configuration. # Building kernel module which module-assistant || apt-get install --yes module-assistant nvidia-kernel-common @@ -17,10 +12,10 @@ module-assistant update module-assistant --non-inter --quiet auto-install nvidia-kernel-legacy module-assistant clean nvidia-kernel-legacy -# Installing aditional stuff +# Installing additional stuff apt-get install --yes nvidia-glx-legacy nvidia-xconfig discover -# fixup (#421028) +# Fix #421028 if [ -f /usr/lib/xorg/modules/drivers/nvidia_drv.o ] then cd /usr/lib/xorg/modules/drivers diff --git a/examples/hooks/rt2570.sh b/examples/hooks/rt2570.sh index bbf79c1..da4d237 100755 --- a/examples/hooks/rt2570.sh +++ b/examples/hooks/rt2570.sh @@ -2,13 +2,9 @@ # This is a hook for live-helper(7) to install ralink rt2570 drivers # To enable it, copy this hook into your config/chroot_local-hooks directory. +# +# FIXME: it runs in interactive mode -# NOTE: it runs in interactive mode - -# Updating indices -apt-get update - -# Building kernel module which module-assistant || apt-get install --yes module-assistant module-assistant update module-assistant auto-install rt2570-source diff --git a/examples/hooks/rt2x00.sh b/examples/hooks/rt2x00.sh index 8c5153c..d94b4e2 100755 --- a/examples/hooks/rt2x00.sh +++ b/examples/hooks/rt2x00.sh @@ -2,11 +2,8 @@ # This is a hook for live-helper(7) to install ralink rt2x00 drivers # To enable it, copy this hook into your config/chroot_local-hooks directory. - -# NOTE: it runs in interactive mode - -# Updating indices -apt-get update +# +# FIXME: it runs in interactive mode # Building kernel modules which module-assistant || apt-get install --yes module-assistant diff --git a/examples/hooks/sun-java5.sh b/examples/hooks/sun-java5.sh index 987b0b2..1e18811 100755 --- a/examples/hooks/sun-java5.sh +++ b/examples/hooks/sun-java5.sh @@ -1,10 +1,11 @@ #!/bin/sh # This is a hook for live-helper(7) to install sun-java. +# To enable it, copy this hook into your config/chroot_local-hooks directory. # -# To enable it, copy this hook into your config/chroot_local-hooks directory and -# don't forget to enable non-free in LIVE_SECTIONS. -# +# Note: This hook requires packages from the non-free section. Make sure you +# enabled it in your configuration. + # live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not # ask any questions while installing packages. Suns redistribution terms for # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for diff --git a/examples/hooks/sun-java6.sh b/examples/hooks/sun-java6.sh index f400b4d..4cb2e06 100755 --- a/examples/hooks/sun-java6.sh +++ b/examples/hooks/sun-java6.sh @@ -1,10 +1,11 @@ #!/bin/sh # This is a hook for live-helper(7) to install sun-java. +# To enable it, copy this hook into your config/chroot_local-hooks directory. # -# To enable it, copy this hook into your config/chroot_local-hooks directory and -# don't forget to enable non-free in LIVE_SECTIONS. -# +# Note: This hook requires packages from the non-free section. Make sure you +# enabled it in your configuration. + # live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not # ask any questions while installing packages. Suns redistribution terms for # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for diff --git a/functions/common.sh b/functions/common.sh index 24212c4..d9d63a7 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a19" +VERSION="1.0~a20" diff --git a/functions/defaults.sh b/functions/defaults.sh index 098a87f..ff2f408 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -511,9 +511,6 @@ Set_defaults () # Setting packages list string LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}" - # Setting package preseed - # LIVE_PRESEED - # Setting tasks string for LIST in ${LIVE_PACKAGES_LISTS} do diff --git a/functions/templates.sh b/functions/templates.sh index 6b60c9e..54f81c1 100755 --- a/functions/templates.sh +++ b/functions/templates.sh @@ -11,10 +11,10 @@ set -e Check_templates () { - ITEM="${1}" + PACKAGE="${1}" # Check user defined templates directory - if [ ! -d "${LIVE_TEMPLATES}" ] + if [ ! -e "${LIVE_TEMPLATES}" ] then if [ -d config/templates ] then @@ -25,11 +25,11 @@ Check_templates () fi fi - if [ -d "${LIVE_TEMPLATES}/${ITEM}" ] + if [ -d "${LIVE_TEMPLATES}/${PACKAGE}" ] then - TEMPLATES="${LIVE_TEMPLATES}/${ITEM}" + TEMPLATES="${LIVE_TEMPLATES}/${PACKAGE}" else - Echo_error "${ITEM} templates not accessible in ${LIVE_TEMPLATES}" + Echo_error "${PACKAGE} templates not accessible in ${LIVE_TEMPLATES}" exit 1 fi } diff --git a/helpers/lh_binary b/helpers/lh_binary index 7a71cbc..c178309 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -24,6 +24,14 @@ USAGE="${PROGRAM} [--force]" Arguments "${@}" +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + # Preparing root filesystem lh_binary_chroot ${*} diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index 077b4e3..9e4d74c 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -106,7 +106,9 @@ fi case "${LH_INITRAMFS}" in casper) - cp "${LH_BASE:-/usr/share/live-helper}"/data/casper/parameters.txt "${DESTDIR}"/parameters.txt + # Checking casper templates + Check_templates casper + cp "${TEMPLATES}"/casper/parameters.txt "${DESTDIR}"/parameters.txt ;; live-initramfs) diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 88a154b..fd6d1cd 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -335,6 +335,32 @@ case "${LIVE_BINARY_IMAGES}" in esac cp -r "${TEMPLATES}"/* binary/isolinux + + for FILE in binary/isolinux/*.live + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live` + done + + if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ] + then + for FILE in binary/isolinux/*.install + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install` + done + + if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ] + then + for FILE in binary/isolinux/*.install.g-i + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i` + done + else + rm -f binary/isolinux/*.install.g-i + fi + else + rm -f binary/isolinux/*.install* + fi + mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg # Copying local configuration file @@ -363,7 +389,8 @@ case "${LIVE_BINARY_IMAGES}" in # Configure syslinux templates sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg - sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt + sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/CD-ROM/" binary/isolinux/f1.txt + sed -i -e "s/LIVE_MEDIA/CD-ROM/" binary/isolinux/f3.txt sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt # Working arround syslinux 8.3 limitation @@ -407,6 +434,32 @@ case "${LIVE_BINARY_IMAGES}" in mkdir -p tftpboot/pxelinux.cfg cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg + + for FILE in tftpboot/pxelinux.cfg/*.live + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live` + done + + if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ] + then + for FILE in tftpboot/pxelinux.cfg/*.install + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install` + done + + if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ] + then + for FILE in tftpboot/pxelinux.cfg/*.install.g-i + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i` + done + else + rm -f tftpboot/pxelinux.cfg/*.install.g-i + fi + else + rm -f tftpboot/pxelinux.cfg/*.install* + fi + mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default # Copying local configuration file @@ -437,7 +490,8 @@ case "${LIVE_BINARY_IMAGES}" in # Configure syslinux templates sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default - sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt + sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt + sed -i -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt # Working arround syslinux 8.3 limitation @@ -476,6 +530,31 @@ case "${LIVE_BINARY_IMAGES}" in cp -r "${TEMPLATES}"/* "${DESTDIR}" + for FILE in "${DESTDIR}"/*.live + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live` + done + + if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ] + then + for FILE in "${DESTDIR}"/*.install + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install` + done + + if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ] + then + for FILE in "${DESTDIR}"/*.install.g-i + do + mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i` + done + else + rm -f "${DESTDIR}"/*.install.g-i + fi + else + rm -f "${DESTDIR}"/*.install* + fi + # Copying local configuration file if [ -f config/binary_syslinux/syslinux.cfg ] then @@ -502,7 +581,8 @@ case "${LIVE_BINARY_IMAGES}" in # Configure syslinux templates sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg - sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt + sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME + sed -i -e "s/LIVE_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt # Workaround for syslinux (<< 3.36) which doesn't support long file/path names diff --git a/helpers/lh_chroot b/helpers/lh_chroot index 7a12d9e..a50f92d 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -47,6 +47,7 @@ lh_chroot_linux-image install ${*} # Customizing chroot lh_chroot_preseed ${*} +lh_chroot_local-preseed ${*} lh_chroot_tasks ${*} lh_chroot_packageslists ${*} lh_chroot_packages ${*} diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index 38bcbba..cba5441 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -89,9 +89,6 @@ 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 -# Touch resolv.conf -touch chroot/etc/resolv.conf - # Remove cruft rm -f chroot/boot/initrd*bak* rm -f /etc/apt/trusted.gpg~ diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed new file mode 100755 index 0000000..f93f463 --- /dev/null +++ b/helpers/lh_chroot_local-preseed @@ -0,0 +1,73 @@ +#!/bin/sh + +# lh_chroot_local-preseed(1) - use debconf local preseeding file +# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="execute local preseed in chroot" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Echo_message "Begin executing locale preseed..." + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_local-preseed + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls config/chroot_local-preseed/* > /dev/null 2>&1 +then + # Check dependency + Check_package chroot/usr/bin/debconf-set-selections debconf + + # Install dependency + Install_package + + for PRESEED in config/chroot_local-preseed/* + do + # Copying local preseed + cp "${PRESEED}" chroot/root/preseed + + Chroot "debconf-set-selections /root/preseed" + + # Removing local preseed file + rm -f chroot/root/preseed + done + + # Remove dependency + Remove_package + + # Creating stage file + Create_stagefile .stage/chroot_local-preseed +fi diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed index 02418c7..6e9cf91 100755 --- a/helpers/lh_chroot_preseed +++ b/helpers/lh_chroot_preseed @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_preseed(1) - mount /proc +# lh_chroot_preseed(1) - use debconf preseeding file # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,11 +32,6 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -if [ -z "${LIVE_PRESEED}" ] -then - exit 0 -fi - Echo_message "Begin executing preseed..." # Requiring stage file @@ -51,28 +46,29 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ -f "${LIVE_PRESEED}" ] -then - # Check dependency - Check_package chroot/usr/bin/debconf-set-selections debconf +# Processing preseeds +for PRESEED in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS} +do + if [ -f ${LH_BASE:-/usr/share/live-helper}/preseed/"${PRESEED}" ] + then + # Check dependency + Check_package chroot/usr/bin/debconf-set-selections debconf - # Install dependency - Install_package + # Install dependency + Install_package - # Copying preseed - cp "${LIVE_PRESEED}" chroot/root/preseed + # Copying preseed + cp "${PRESEED}" chroot/root/preseed - Chroot "debconf-set-selections /root/preseed" + Chroot "debconf-set-selections /root/preseed" - # Removing preseed file - rm -f chroot/root/preseed + # Removing preseed file + rm -f chroot/root/preseed - # Remove dependency - Remove_package + # Remove dependency + Remove_package - # Creating stage file - Create_stagefile .stage/chroot_preseed -else - Echo_error "'${LIVE_PRESEED}' file doesn't exists." - exit 1 -fi + # Creating stage file + Create_stagefile .stage/chroot_preseed + fi +done diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index 2505172..0409054 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -75,11 +75,11 @@ case "${1}" in if [ -f chroot/etc/resolv.conf.orig ] then - # Restore resolv file + # Restoring resolv file mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf else - # Remove resolv file - rm -f chroot/etc/resolv.conf + # Truncating resolv file + cat < /dev/null > chroot/etc/resolv.conf fi # Removing stage file diff --git a/helpers/lh_config b/helpers/lh_config index d101571..41c0432 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -272,10 +272,6 @@ LIVE_PACKAGES="${LIVE_PACKAGES}" # (Default: ${LIVE_PACKAGES_LISTS}) LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" -# \$LIVE_PRESEED: set package preseed -# (Default: ${LIVE_PRESEED}) -LIVE_PRESEED="${LIVE_PRESEED}" - # \$LIVE_TASKS: set tasks to install # (Default: empty) LIVE_TASKS="${LIVE_TASKS}" diff --git a/helpers/make-live b/helpers/make-live index 08133e7..b0fa676 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -33,13 +33,13 @@ done # Setting static variables PROGRAM="`basename ${0}`" DESCRIPTION="utility to build Debian Live systems" -USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" +USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavours FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--iso-preparer STRING] [--iso-publisher STRING] [--iso-application STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior" Local_arguments () { - ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" + ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,bootstrap-flavour:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,linux-flavours:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,linux-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,net-server:,net-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,source-images:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" if [ "${?}" -ne "0" ] then diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1 index 0474b6c..1e39cc8 100644 --- a/manpages/lh_binary.de.1 +++ b/manpages/lh_binary.de.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_BINARY 1 "23.07.2007" "1.0~a20" "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 1694d07..f0648c5 100644 --- a/manpages/lh_binary.en.1 +++ b/manpages/lh_binary.en.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_BINARY 1 "2007\-07\-23" "1.0~a20" "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 5563c42..20823df 100644 --- a/manpages/lh_bootstrap.de.1 +++ b/manpages/lh_bootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_BOOTSTRAP 1 "23.07.2007" "1.0~a20" "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 559996a..447b8d0 100644 --- a/manpages/lh_bootstrap.en.1 +++ b/manpages/lh_bootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-07\-23" "1.0~a20" "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 d42188c..65c3244 100644 --- a/manpages/lh_bootstrap_cdebootstrap.de.1 +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "23.07.2007" "1.0~a20" "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 6d96c0a..531909f 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\-16" "1.0~a19" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-23" "1.0~a20" "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 20eeeeb..bcc267a 100644 --- a/manpages/lh_bootstrap_debootstrap.de.1 +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "23.07.2007" "1.0~a20" "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 4772cf2..b552658 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\-16" "1.0~a19" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-23" "1.0~a20" "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 2e5039d..a5aa4ce 100644 --- a/manpages/lh_build.de.1 +++ b/manpages/lh_build.de.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_BUILD 1 "23.07.2007" "1.0~a20" "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 daaa023..1d7ebcf 100644 --- a/manpages/lh_build.en.1 +++ b/manpages/lh_build.en.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_BUILD 1 "2007\-07\-23" "1.0~a20" "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 15829a7..dc290a4 100644 --- a/manpages/lh_chroot.de.1 +++ b/manpages/lh_chroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_CHROOT 1 "23.07.2007" "1.0~a20" "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 8f76c19..87361c4 100644 --- a/manpages/lh_chroot.en.1 +++ b/manpages/lh_chroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_CHROOT 1 "2007\-07\-23" "1.0~a20" "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 23cf366..6c87f0f 100644 --- a/manpages/lh_clean.de.1 +++ b/manpages/lh_clean.de.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_CLEAN 1 "23.07.2007" "1.0~a20" "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 f8136f8..e52a94b 100644 --- a/manpages/lh_clean.en.1 +++ b/manpages/lh_clean.en.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_CLEAN 1 "2007\-07\-23" "1.0~a20" "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 bc1e2c1..0c90d40 100644 --- a/manpages/lh_source.de.1 +++ b/manpages/lh_source.de.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_SOURCE 1 "23.07.2007" "1.0~a20" "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 355fd2c..a2c37a5 100644 --- a/manpages/lh_source.en.1 +++ b/manpages/lh_source.en.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_SOURCE 1 "2007\-07\-23" "1.0~a20" "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 b41ba27..b5fe723 100644 --- a/manpages/lh_testroot.de.1 +++ b/manpages/lh_testroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "16.07.2007" "1.0~a19" "live\-helper" +.TH LH_TESTROOT 1 "23.07.2007" "1.0~a20" "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 30f4e18..065dcfa 100644 --- a/manpages/lh_testroot.en.1 +++ b/manpages/lh_testroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LH_TESTROOT 1 "2007\-07\-23" "1.0~a20" "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 97dae2a..f44c6f3 100644 --- a/manpages/live-helper.de.7 +++ b/manpages/live-helper.de.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "16.07.2007" "1.0~a19" "live\-helper" +.TH LIVE\-HELPER 7 "23.07.2007" "1.0~a20" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme @@ -9,7 +9,7 @@ live\-helper \- Debian Live Helper-Programme .SH BESCHREIBUNG Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen. .PP -Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \fImake\-live\fR(1). +Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. .\" .SH CONFIGURATION FILE .\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use. diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7 index b1c0b71..e799a75 100644 --- a/manpages/live-helper.en.7 +++ b/manpages/live-helper.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-07\-16" "1.0~a19" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-07\-23" "1.0~a20" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs @@ -9,7 +9,7 @@ live\-helper \- Debian Live helper programs .SH DESCRIPTION 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 small, simple, and easily understood tools that can be used in your own program to automate building of a Live system. .PP -A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1). +A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. .\" .SH CONFIGURATION FILE .\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use. diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1 deleted file mode 100644 index d4c33d5..0000000 --- a/manpages/make-live.de.1 +++ /dev/null @@ -1,88 +0,0 @@ -.TH MAKE\-LIVE 1 "16.07.2007" "1.0~a19" "live\-helper" - -.SH NAME -make\-live \- erstellt ein Debian Live-System - -.SH SYNOPSIS -.B make\-live -[config] -[\-\-mode \fIMODE\fR] -[\-\-config \fICONFIG\fR] -[\-\-apt \fIapt\fR|\fIaptitude\fR] -[\-\-apt\-ftpproxy \fIURL\fR] -[\-\-apt\-httpproxy \fIURL\fR] -[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-recommends \fIenabled\fR|\fIdisabled] -[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR] -[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR] -[\-\-cache \fIenabled\fR|\fIdisabled\fR] -[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR] -[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR] -[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR] -[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR] -[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR] -[\-\-tasksel \fIaptitude\fR|\fItasksel\fR] -[\-r|\-\-root \fIDIRECTORY\fR] -[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR] -[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR] -[\-\-distribution\-config \fIDIRECTORY\fR] -[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR] -[\-m|\-\-mirror\-build \fIURL\fR] -[\-\-mirror\-build\-security \fIURL\fR] -[\-\-mirror\-image \fIURL\fR] -[\-\-mirror\-image\-security \fIURL\fR] -[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR] -[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR] -[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR] -[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR] -[\-l|\-\-language \fILANGUAGE\fR] -[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR] -[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR] -[\-\-security \fIenabled\fR|\fIdisabled\fR] -[\-\-symlinks \fIenabled\fR|\fIdisabled\fR] -[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR] -[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR] -[\-e|\-\-encryption \fIALGORITHM\fR] -[\-\-username \fINAME\fR] -[\-\-hostname \fINAME\fR] -[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR] -[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR] -[\-\-iso\-volume \fISTRING\fR] -[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR] -[\-\-server\-path \fIDIRECTORY\fR] -[\-\-source \fIenabled\fR|\fIdisabled\fR] -[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] -[\-\-grub\-splash \fIFILE\fR] -[\-\-syslinux\-splash \fIFILE\fR] -[\-b|\-\-binary\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] -[\-s|\-\-source\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] -[\-\-includes \fIPATH\fR] -[\-\-templates \fIPATH\fR] -[\-\-breakpoints] -[\-\-debug] -[\-\-force] -[\-\-quiet] -[\-\-verbose] - -.SH BESCHREIBUNG -make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen. - -.SH OPTIONEN - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/make-live.en.1 b/manpages/make-live.en.1 deleted file mode 100644 index 9af8979..0000000 --- a/manpages/make-live.en.1 +++ /dev/null @@ -1,88 +0,0 @@ -.TH MAKE\-LIVE 1 "2007\-07\-16" "1.0~a19" "live\-helper" - -.SH NAME -make\-live \- build a Debian Live system - -.SH SYNOPSIS -.B make\-live -[config] -[\-\-mode \fIMODE\fR] -[\-\-config \fICONFIG\fR] -[\-\-apt \fIapt\fR|\fIaptitude\fR] -[\-\-apt\-ftpproxy \fIURL\fR] -[\-\-apt\-httpproxy \fIURL\fR] -[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-recommends \fIenabled\fR|\fIdisabled] -[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR] -[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR] -[\-\-cache \fIenabled\fR|\fIdisabled\fR] -[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR] -[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR] -[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR] -[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR] -[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR] -[\-\-tasksel \fIaptitude\fR|\fItasksel\fR] -[\-r|\-\-root \fIDIRECTORY\fR] -[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR] -[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR] -[\-\-distribution\-config \fIDIRECTORY\fR] -[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR] -[\-m|\-\-mirror\-build \fIURL\fR] -[\-\-mirror\-build\-security \fIURL\fR] -[\-\-mirror\-image \fIURL\fR] -[\-\-mirror\-image\-security \fIURL\fR] -[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR] -[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR] -[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR] -[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR] -[\-l|\-\-language \fILANGUAGE\fR] -[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR] -[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR] -[\-\-security \fIenabled\fR|\fIdisabled\fR] -[\-\-symlinks \fIenabled\fR|\fIdisabled\fR] -[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR] -[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR] -[\-e|\-\-encryption \fIALGORITHM\fR] -[\-\-username \fINAME\fR] -[\-\-hostname \fINAME\fR] -[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR] -[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR] -[\-\-iso\-volume \fISTRING\fR] -[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR] -[\-\-server\-path \fIDIRECTORY\fR] -[\-\-source \fIenabled\fR|\fIdisabled\fR] -[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] -[\-\-grub\-splash \fIFILE\fR] -[\-\-syslinux\-splash \fIFILE\fR] -[\-b|\-\-binary\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] -[\-s|\-\-source\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR] -[\-\-includes \fIPATH\fR] -[\-\-templates \fIPATH\fR] -[\-\-breakpoints] -[\-\-debug] -[\-\-force] -[\-\-quiet] -[\-\-verbose] - -.SH DESCRIPTION -make\-live is a script calling all required live\-helper(7) programs to build a live system. - -.SH OPTIONS - -.SH SEE ALSO -\fIlive\-helper\fR(7) -.PP -This program is a part of live\-helper. - -.SH BUGS -Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. - -.SH HOMEPAGE -More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. - -.SH AUTHOR -live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project. diff --git a/templates/casper/parameters.txt b/templates/casper/parameters.txt new file mode 100644 index 0000000..dcc04fc --- /dev/null +++ b/templates/casper/parameters.txt @@ -0,0 +1,49 @@ +Boot Parameters for Debian Live +------------------------------- + +Updated for casper 1.77+debian-7 on 2007-02-08. + +These options (can be combined) work from the syslinux bootprompt: + +casper casper-getty +casper xdebconf +casper hostname=HOSTNAME +casper userfullname=USERFULLNAME +casper username=USERNAME +casper {keyb|kbd-chooser/method}=KEYBOARD +casper {klayout|console-setup/layoutcode}=LAYOUT +casper {kvariant|console-setup/variantcode}=VARIANT , +casper {kmodel|console-setup/modelcode}=CODE , koptions=OPTIONS +casper ip=IFACE,ADDRESS,NETMASK,GATEWAY[:IFACE,ADDRESS,NETMASK,GATEWAY]* +casper ip[=frommedia] +casper {live-media|bootfrom}=DEVICE +casper live-media-offset=BYTES +casper locale=LOCALE | debian-installer/locale=LOCALE +casper netboot[=nfs|cifs] +casper persistent +casper nopersistent +casper showmounts +casper todisk=DEVICE +casper toram +casper {preseed/file|file}=FILE +casper package/question=VALUE + +Values for the vga kernel parameter: + +Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200 +--------+-------------------------------------------------------------- + 4 bits | ? ? 0x302 ? ? ? ? + 8 bits | 0x300 0x301 0x303 0x305 0x161 0x307 0x31C +15 bits | ? 0x310 0x313 0x316 0x162 0x319 0x31D +16 bits | ? 0x311 0x314 0x317 0x163 0x31A 0x31E +24 bits | ? 0x312 0x315 0x318 ? 0x31B 0x31F +32 bits | ? ? ? ? 0x164 ? + +Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200 +--------+-------------------------------------------------------------- + 4 bits | ? ? 770 ? ? ? ? + 8 bits | 768 769 771 773 353 775 796 +15 bits | ? 784 787 790 354 793 797 +16 bits | ? 758 788 791 355 794 798 +24 bits | ? 786 789 792 ? 795 799 +32 bits | ? ? ? ? 356 ? diff --git a/templates/syslinux/boot.txt b/templates/syslinux/boot.txt index 2fe3ead..56dffca 100644 --- a/templates/syslinux/boot.txt +++ b/templates/syslinux/boot.txt @@ -1,3 +1,3 @@ splash.rle -Press F1control and F then 1 for help, or ENTER to
\ No newline at end of file +Press F1control and F then 1 for help, or ENTER to diff --git a/templates/syslinux/f1.txt.install b/templates/syslinux/f1.txt.install new file mode 100644 index 0000000..a26234f --- /dev/null +++ b/templates/syslinux/f1.txt.install @@ -0,0 +1,25 @@ + 0fWelcome to Debian GNU/Linux!07 09F107 + +This is a Debian LIVE_DISTRIBUTION combined live and installation LIVE_MEDIA. +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 LIVE_MEDIA +<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/f1.txt b/templates/syslinux/f1.txt.live index 2e8656c..5a6aecf 100644 --- a/templates/syslinux/f1.txt +++ b/templates/syslinux/f1.txt.live @@ -1,6 +1,6 @@ 0fWelcome to Debian GNU/Linux!07 09F107 -This is a Debian Live CD-ROM. +This is a Debian LIVE_DISTRIBUTION live LIVE_MEDIA. It was built on LIVE_DATE. 0fHELP INDEX07 @@ -9,8 +9,8 @@ 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; live and rescue modes. +<09F307> Boot methods for special ways of using this LIVE_MEDIA +<09F407> Additional boot methods. <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/f2.txt b/templates/syslinux/f2.txt.install index 60243d3..12c0b22 100644 --- a/templates/syslinux/f2.txt +++ b/templates/syslinux/f2.txt.install @@ -1,6 +1,12 @@ - 0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207 + 0fPREREQUISITES FOR USING DEBIAN07 09F207 -You must have at least 32 megabytes of RAM to use this Debian installer. +You must have at least 64 megabytes of RAM to run this Debian Live system. + +See the Live Manual or the FAQ for more information; both +documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07 + + +You must have at least 32 megabytes of RAM to use the 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 @@ -14,10 +20,4 @@ Thank you for choosing Debian! - - - - - - -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/f2.txt.live b/templates/syslinux/f2.txt.live new file mode 100644 index 0000000..f79062a --- /dev/null +++ b/templates/syslinux/f2.txt.live @@ -0,0 +1,23 @@ + 0fPREREQUISITES FOR RUNNING DEBIAN07 09F207 + +You must have at least 64 megabytes of RAM to run this Debian Live system. + +See the Live Manual or the FAQ for more information; both +documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07 + +Thank you for choosing Debian! + + + + + + + + + + + + + + +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f3.txt b/templates/syslinux/f3.txt.install index 5f3996f..db59717 100644 --- a/templates/syslinux/f3.txt +++ b/templates/syslinux/f3.txt.install @@ -1,23 +1,23 @@ 0fBOOT METHODS07 09F307 - 0fAvailable boot methods:07 +0flive07 + Start the live system -- this is the default LIVE_MEDIA method. +0flive-failsafe07 + Start the live system in fail-safe mode. 0finstall07 Start the installation. -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: install acpi=off If unsure, you should use the default boot method, with no special parameters, by simply pressing enter at the boot prompt. +Except in expert mode, non-critical kernel boot messages are suppressed. + Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f3.txt.install.g-i b/templates/syslinux/f3.txt.install.g-i new file mode 100644 index 0000000..445ddbd --- /dev/null +++ b/templates/syslinux/f3.txt.install.g-i @@ -0,0 +1,23 @@ + 0fBOOT METHODS07 09F307 + +0fAvailable boot methods:07 + +0flive07 + Start the live system -- this is the default LIVE_MEDIA method. +0flive-failsafe07 + Start the live system in fail-safe mode. +0finstall07 or 0finstallgui07 + Start the installation using the normal or graphical installer. +0fexpert07 and 0fexpertgui07 + Start the installation in expert mode, for maximum control. + +To use one of these boot methods, type it at the prompt, optionally +followed by any boot parameters. For example: + 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. + +Except in expert mode, non-critical kernel boot messages are suppressed. + +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f3.txt.live b/templates/syslinux/f3.txt.live new file mode 100644 index 0000000..397c649 --- /dev/null +++ b/templates/syslinux/f3.txt.live @@ -0,0 +1,23 @@ + 0fBOOT METHODS07 09F307 + +0fAvailable boot methods:07 + +0flive07 + Start the live system -- this is the default LIVE_MEDIA method. +0flive-failsafe07 + Start the live system in fail-safe mode. + + + + + + + +To use one of these boot methods, type it at the prompt, optionally +followed by any boot parameters. For example: + boot: live 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 diff --git a/templates/syslinux/f4.txt.install b/templates/syslinux/f4.txt.install new file mode 100644 index 0000000..106c30e --- /dev/null +++ b/templates/syslinux/f4.txt.install @@ -0,0 +1,23 @@ + 0fRESCUE MODE07 09F407 + +0fUse one of these boot methods to rescue an existing install07 + +0frescue07 + Boot into rescue mode. + +0fmemtest07 + Start memtest to scan your RAM for errors. +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 diff --git a/templates/syslinux/f4.txt b/templates/syslinux/f4.txt.install.g-i index 1167738..db29ea6 100644 --- a/templates/syslinux/f4.txt +++ b/templates/syslinux/f4.txt.install.g-i @@ -1,12 +1,4 @@ - 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. + 0fRESCUE MODE07 09F407 0fUse one of these boot methods to rescue an existing install07 @@ -16,8 +8,16 @@ Boot into rescue mode using the graphical installer. 0fmemtest07 - Run memtest86+ (memory tester). + Start memtest to scan your RAM for errors. 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 diff --git a/templates/syslinux/f4.txt.live b/templates/syslinux/f4.txt.live new file mode 100644 index 0000000..6a76aca --- /dev/null +++ b/templates/syslinux/f4.txt.live @@ -0,0 +1,23 @@ + 0fADDITIONAL BOOT METHODS07 09F307 + +0fAvailable boot methods:07 + +0fmemtest07 + Start memtest to scan your RAM for errors. +0ffloppy07, 0fdisk107 or 0fdisk207 + Boot from the floppy, first or second hard disk. + + + + + + + + + + + + + + +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f5.txt b/templates/syslinux/f5.txt index 6e73913..58bbb94 100644 --- a/templates/syslinux/f5.txt +++ b/templates/syslinux/f5.txt @@ -20,4 +20,4 @@ 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 +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f6.txt b/templates/syslinux/f6.txt index 4bdb09a..772fd50 100644 --- a/templates/syslinux/f6.txt +++ b/templates/syslinux/f6.txt @@ -7,17 +7,17 @@ If you use hex numbers you have to use the 0x prefix (e.g., 0x300). 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, +Possible (temporary) workarounds for lockups or other hardware failures: disable buggy APIC interrupt routing 0fnoapic nolapic07 +(partly) disable ACPI 0facpi=noirq07 or 0facpi=off07 +disable USB 0fnousb07 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 +Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f7.txt b/templates/syslinux/f7.txt index 48f76c9..cd7ca7e 100644 --- a/templates/syslinux/f7.txt +++ b/templates/syslinux/f7.txt @@ -16,8 +16,8 @@ for more. -For example: +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 +Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT} diff --git a/templates/syslinux/f8.txt b/templates/syslinux/f8.txt index 04341b6..bc40696 100644 --- a/templates/syslinux/f8.txt +++ b/templates/syslinux/f8.txt @@ -1,6 +1,6 @@ 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 09F807 -You can use the following boot parameters at the 0fboot:07 prompt, +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 @@ -8,7 +8,6 @@ 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 @@ -16,8 +15,9 @@ Use Braille tty 0fbrltty=driver,device,texttable07 Use high contrast accessibility theme 0ftheme=dark07 Use special tasks 0ftasks="kde-desktop, standard"07 -For example: + +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 +Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT} diff --git a/templates/syslinux/f9.txt b/templates/syslinux/f9.txt.install index b0cac8d..b6acea6 100644 --- a/templates/syslinux/f9.txt +++ b/templates/syslinux/f9.txt.install @@ -11,13 +11,13 @@ experience! See the Installation Manual or the FAQ for more information; both documents are available at the Debian web site, 0fhttp://www.debian.org/07 +If you can't run the Debian Live system, see the Installation Manual or +the FAQ for more information; both documents are available at +the Debian web site, 0fhttp://debian-live.alioth.debian.org/07 - - - -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 ${BOOTPROMPT} diff --git a/templates/syslinux/f9.txt.live b/templates/syslinux/f9.txt.live new file mode 100644 index 0000000..f39ec37 --- /dev/null +++ b/templates/syslinux/f9.txt.live @@ -0,0 +1,23 @@ + 0fGETTING HELP07 09F907 + +If you can't run Debian, don't despair! The Debian team is ready to +help you! We are especially interested in hearing about boot +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 Live Manual or the FAQ for more information; both +documents are available at the Debian web site, +0fhttp://debian-live.alioth.debian.org/07 + + + + + + + + + +Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT} diff --git a/templates/syslinux/syslinux.cfg b/templates/syslinux/syslinux.cfg index 733a5eb..48599ed 100644 --- a/templates/syslinux/syslinux.cfg +++ b/templates/syslinux/syslinux.cfg @@ -20,17 +20,17 @@ LINUX_INSTALL MEMTEST -#LABEL floppy -# localboot 0x00 +LABEL floppy + localboot 0x00 -#LABEL disk1 -# localboot 0x80 +LABEL disk1 + localboot 0x80 -#LABEL disk2 -# localboot 0x81 +LABEL disk2 + localboot 0x81 -#LABEL nextboot -# localboot -1 +LABEL nextboot + localboot -1 PROMPT 1 TIMEOUT 0 |