[Debian-live-changes] r2598 - in dists/trunk/live-helper: data docs functions helpers templates templates/casper templates/syslinux
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri Jul 27 21:39:33 UTC 2007
Author: daniel
Date: 2007-07-27 21:39:33 +0000 (Fri, 27 Jul 2007)
New Revision: 2598
Added:
dists/trunk/live-helper/helpers/lh_chroot_local-preseed
dists/trunk/live-helper/templates/casper/
dists/trunk/live-helper/templates/syslinux/f1.txt.install
dists/trunk/live-helper/templates/syslinux/f1.txt.live
dists/trunk/live-helper/templates/syslinux/f2.txt.install
dists/trunk/live-helper/templates/syslinux/f2.txt.live
dists/trunk/live-helper/templates/syslinux/f3.txt.install
dists/trunk/live-helper/templates/syslinux/f3.txt.install.g-i
dists/trunk/live-helper/templates/syslinux/f3.txt.live
dists/trunk/live-helper/templates/syslinux/f4.txt.install
dists/trunk/live-helper/templates/syslinux/f4.txt.install.g-i
dists/trunk/live-helper/templates/syslinux/f4.txt.live
dists/trunk/live-helper/templates/syslinux/f9.txt.install
dists/trunk/live-helper/templates/syslinux/f9.txt.live
Removed:
dists/trunk/live-helper/data/casper/
dists/trunk/live-helper/templates/syslinux/f1.txt
dists/trunk/live-helper/templates/syslinux/f2.txt
dists/trunk/live-helper/templates/syslinux/f3.txt
dists/trunk/live-helper/templates/syslinux/f4.txt
dists/trunk/live-helper/templates/syslinux/f9.txt
Modified:
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_binary_linux-image
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/helpers/lh_chroot
dists/trunk/live-helper/helpers/lh_chroot_preseed
dists/trunk/live-helper/helpers/lh_config
dists/trunk/live-helper/templates/casper/parameters.txt
dists/trunk/live-helper/templates/syslinux/boot.txt
dists/trunk/live-helper/templates/syslinux/f5.txt
dists/trunk/live-helper/templates/syslinux/f6.txt
dists/trunk/live-helper/templates/syslinux/f7.txt
dists/trunk/live-helper/templates/syslinux/f8.txt
dists/trunk/live-helper/templates/syslinux/syslinux.cfg
Log:
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-07-27 21:39:33 UTC (rev 2598)
@@ -4,6 +4,14 @@
- 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 at debian.org>
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-07-27 21:39:33 UTC (rev 2598)
@@ -511,9 +511,6 @@
# 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
Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-27 21:39:33 UTC (rev 2598)
@@ -106,7 +106,9 @@
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)
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-27 21:39:33 UTC (rev 2598)
@@ -335,6 +335,32 @@
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 @@
# Configure syslinux templates
sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at 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 @@
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 @@
# Configure syslinux templates
sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at 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 @@
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 @@
# Configure syslinux templates
sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at 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
Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/helpers/lh_chroot 2007-07-27 21:39:33 UTC (rev 2598)
@@ -47,6 +47,7 @@
# Customizing chroot
lh_chroot_preseed ${*}
+lh_chroot_local-preseed ${*}
lh_chroot_tasks ${*}
lh_chroot_packageslists ${*}
lh_chroot_packages ${*}
Added: dists/trunk/live-helper/helpers/lh_chroot_local-preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-preseed (rev 0)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-preseed 2007-07-27 21:39:33 UTC (rev 2598)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# lh_chroot_local-preseed(1) - use debconf local preseeding file
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at 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
Property changes on: dists/trunk/live-helper/helpers/lh_chroot_local-preseed
___________________________________________________________________
Name: svn:executable
+ *
Modified: dists/trunk/live-helper/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/helpers/lh_chroot_preseed 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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 at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,11 +32,6 @@
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 @@
# 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
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/helpers/lh_config 2007-07-27 21:39:33 UTC (rev 2598)
@@ -272,10 +272,6 @@
# (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}"
Copied: dists/trunk/live-helper/templates/casper (from rev 2596, dists/trunk/live-helper/data/casper)
Modified: dists/trunk/live-helper/templates/casper/parameters.txt
===================================================================
--- dists/trunk/live-helper/data/casper/parameters.txt 2007-07-27 09:03:43 UTC (rev 2596)
+++ dists/trunk/live-helper/templates/casper/parameters.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -27,3 +27,23 @@
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 ?
Modified: dists/trunk/live-helper/templates/syslinux/boot.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/boot.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/boot.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Deleted: dists/trunk/live-helper/templates/syslinux/f1.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f1.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f1.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -1,25 +0,0 @@
- 0fWelcome to Debian GNU/Linux!07 09F107
-
-This is a Debian Live CD-ROM.
-It was built on LIVE_DATE.
-
-0fHELP INDEX07
-
-0fKEY TOPIC07
-
-<09F107> This page, the help index.
-<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this CD-ROM
-<09F407> 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.
-<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
Added: dists/trunk/live-helper/templates/syslinux/f1.txt.install
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f1.txt.install (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f1.txt.install 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Copied: dists/trunk/live-helper/templates/syslinux/f1.txt.live (from rev 2596, dists/trunk/live-helper/templates/syslinux/f1.txt)
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f1.txt.live (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f1.txt.live 2007-07-27 21:39:33 UTC (rev 2598)
@@ -0,0 +1,25 @@
+ 0fWelcome to Debian GNU/Linux!07 09F107
+
+This is a Debian LIVE_DISTRIBUTION live 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.
+<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
Deleted: dists/trunk/live-helper/templates/syslinux/f2.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f2.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f2.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -1,23 +0,0 @@
- 0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207
-
-You must have at least 32 megabytes of RAM to use this Debian installer.
-
-You should have space on your hard disk to create a new disk partition
-of at least 256 megabytes to install the base system. You'll need more
-disk space to install additional packages, depending on what you wish
-to do with your new Debian system.
-
-See the Installation Manual or the FAQ for more information; both
-documents are available at the Debian web site, 0fhttp://www.debian.org/07
-
-Thank you for choosing Debian!
-
-
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Added: dists/trunk/live-helper/templates/syslinux/f2.txt.install
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f2.txt.install (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f2.txt.install 2007-07-27 21:39:33 UTC (rev 2598)
@@ -0,0 +1,23 @@
+ 0fPREREQUISITES FOR USING 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
+
+
+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
+disk space to install additional packages, depending on what you wish
+to do with your new Debian system.
+
+See the Installation Manual or the FAQ for more information; both
+documents are available at the Debian web site, 0fhttp://www.debian.org/07
+
+Thank you for choosing Debian!
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
Copied: dists/trunk/live-helper/templates/syslinux/f2.txt.live (from rev 2596, dists/trunk/live-helper/templates/syslinux/f2.txt)
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f2.txt.live (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f2.txt.live 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Deleted: dists/trunk/live-helper/templates/syslinux/f3.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f3.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f3.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -1,23 +0,0 @@
- 0fBOOT METHODS07 09F307
-
-
-0fAvailable boot methods:07
-
-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.
-
-Press F1control and F then 1 for the help index, or ENTER to
Added: dists/trunk/live-helper/templates/syslinux/f3.txt.install
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f3.txt.install (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f3.txt.install 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
+ Start the installation.
+0fexpert07
+ 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
Added: dists/trunk/live-helper/templates/syslinux/f3.txt.install.g-i
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f3.txt.install.g-i (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f3.txt.install.g-i 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Copied: dists/trunk/live-helper/templates/syslinux/f3.txt.live (from rev 2596, dists/trunk/live-helper/templates/syslinux/f3.txt)
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f3.txt.live (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f3.txt.live 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Deleted: dists/trunk/live-helper/templates/syslinux/f4.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f4.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f4.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -1,23 +0,0 @@
- 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
- Boot into rescue mode.
-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.
-
-Press F1control and F then 1 for the help index, or ENTER to
Added: dists/trunk/live-helper/templates/syslinux/f4.txt.install
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f4.txt.install (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f4.txt.install 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Added: dists/trunk/live-helper/templates/syslinux/f4.txt.install.g-i
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f4.txt.install.g-i (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f4.txt.install.g-i 2007-07-27 21:39:33 UTC (rev 2598)
@@ -0,0 +1,23 @@
+ 0fRESCUE MODE07 09F407
+
+0fUse one of these boot methods to rescue an existing install07
+
+0frescue07
+ Boot into rescue mode.
+0frescuegui07
+ Boot into rescue mode using the graphical installer.
+
+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
Copied: dists/trunk/live-helper/templates/syslinux/f4.txt.live (from rev 2596, dists/trunk/live-helper/templates/syslinux/f4.txt)
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f4.txt.live (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f4.txt.live 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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
Modified: dists/trunk/live-helper/templates/syslinux/f5.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f5.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f5.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -20,4 +20,4 @@
-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
Modified: dists/trunk/live-helper/templates/syslinux/f6.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f6.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f6.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -7,17 +7,17 @@
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
Modified: dists/trunk/live-helper/templates/syslinux/f7.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f7.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f7.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -16,8 +16,8 @@
+
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}
Modified: dists/trunk/live-helper/templates/syslinux/f8.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f8.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f8.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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 @@
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 high contrast accessibility theme 0ftheme=dark07
Use special tasks 0ftasks="kde-desktop, standard"07
+
+
For example:
-
boot: install fb=false
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
+Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}
Deleted: dists/trunk/live-helper/templates/syslinux/f9.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f9.txt 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/f9.txt 2007-07-27 21:39:33 UTC (rev 2598)
@@ -1,23 +0,0 @@
- 0fGETTING HELP07 09F907
-
-If you can't install Debian, don't despair! The Debian team is ready to
-help you! We are especially interested in hearing about installation
-problems, because in general they don't happen to only 0fone07 person.
-We've either already heard about your particular problem and can dispense a
-quick fix, or we would like to hear about it and work through it with you,
-and the next user who comes up with the same problem will profit from your
-experience!
-
-See the Installation Manual or the FAQ for more information; both
-documents are available at the Debian web site, 0fhttp://www.debian.org/07
-
-
-
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Added: dists/trunk/live-helper/templates/syslinux/f9.txt.install
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f9.txt.install (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f9.txt.install 2007-07-27 21:39:33 UTC (rev 2598)
@@ -0,0 +1,23 @@
+ 0fGETTING HELP07 09F907
+
+If you can't install Debian, don't despair! The Debian team is ready to
+help you! We are especially interested in hearing about installation
+problems, because in general they don't happen to only 0fone07 person.
+We've either already heard about your particular problem and can dispense a
+quick fix, or we would like to hear about it and work through it with you,
+and the next user who comes up with the same problem will profit from your
+experience!
+
+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 ${BOOTPROMPT}
Copied: dists/trunk/live-helper/templates/syslinux/f9.txt.live (from rev 2596, dists/trunk/live-helper/templates/syslinux/f9.txt)
===================================================================
--- dists/trunk/live-helper/templates/syslinux/f9.txt.live (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/f9.txt.live 2007-07-27 21:39:33 UTC (rev 2598)
@@ -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}
Modified: dists/trunk/live-helper/templates/syslinux/syslinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/syslinux.cfg 2007-07-27 21:39:14 UTC (rev 2597)
+++ dists/trunk/live-helper/templates/syslinux/syslinux.cfg 2007-07-27 21:39:33 UTC (rev 2598)
@@ -20,17 +20,17 @@
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
More information about the Debian-live-changes
mailing list