summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:52 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit7c68e6ebca01f64501453fa53941ac77b9c2c335 (patch)
treebaad74e1f3cbe6660320b7ad3c4abe967a38b16c /templates
parentbd1a5ddc8203907eb40135303bea5488397ec5d0 (diff)
downloadlive-build-7c68e6ebca01f64501453fa53941ac77b9c2c335.zip
live-build-7c68e6ebca01f64501453fa53941ac77b9c2c335.tar.gz
Adding live-helper 1.0~a9-1.
Diffstat (limited to 'templates')
-rw-r--r--templates/syslinux/f1.txt2
-rw-r--r--templates/syslinux/f3.txt4
-rw-r--r--templates/syslinux/f4.txt26
-rw-r--r--templates/syslinux/isolinux.cfg12
4 files changed, 28 insertions, 16 deletions
diff --git a/templates/syslinux/f1.txt b/templates/syslinux/f1.txt
index b54d5f3..2e8656c 100644
--- a/templates/syslinux/f1.txt
+++ b/templates/syslinux/f1.txt
@@ -10,7 +10,7 @@ It was built on LIVE_DATE.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
<09F307> Boot methods for special ways of using this CD-ROM
-<09F407> Additional boot methods; rescue mode.
+<09F407> Additional boot methods; live and rescue modes.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
<09F707> Special boot parameters for selected disk controllers.
diff --git a/templates/syslinux/f3.txt b/templates/syslinux/f3.txt
index 9cd2ba5..5f3996f 100644
--- a/templates/syslinux/f3.txt
+++ b/templates/syslinux/f3.txt
@@ -4,7 +4,7 @@
0fAvailable boot methods:07
0finstall07
- Start the installation -- this is the default CD-ROM install.
+ Start the installation.
0finstallgui07
Start the installation using the graphical installer.
0fexpert07
@@ -20,4 +20,4 @@ followed by any boot parameters. For example:
If unsure, you should use the default boot method, with no special
parameters, by simply pressing enter at the boot prompt.
-Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file
+Press F1control and F then 1 for the help index, or ENTER to
diff --git a/templates/syslinux/f4.txt b/templates/syslinux/f4.txt
index c2cf4f4..1167738 100644
--- a/templates/syslinux/f4.txt
+++ b/templates/syslinux/f4.txt
@@ -1,6 +1,13 @@
- 0fRESCUE MODE07 09F407
+ 0fLIVE AND RESCUE MODES07 09F407
+0fUse one of these boot methods to start the live system07
+
+0flive07
+ Start the live system in standard mode -- this is the default.
+0flive-failsafe07
+ Start the live system in failsafe mode.
+
0fUse one of these boot methods to rescue an existing install07
0frescue07
@@ -8,16 +15,9 @@
0frescuegui07
Boot into rescue mode using the graphical installer.
+0fmemtest07
+ Run memtest86+ (memory tester).
+0ffloppy07, 0fdisk107 or 0fdisk207
+ Boot from the floppy, first or second hard disk.
-
-
-
-
-
-To use one of these boot methods, type it at the prompt, optionally
-followed by any boot parameters. For example:
-
- boot: rescue acpi=off
-
-
-Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file
+Press F1control and F then 1 for the help index, or ENTER to
diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg
index 7697831..c44e657 100644
--- a/templates/syslinux/isolinux.cfg
+++ b/templates/syslinux/isolinux.cfg
@@ -20,5 +20,17 @@ LIVE_KERNEL_INSTALL
LIVE_MEMTEST
+#LABEL floppy
+# localboot 0x00
+
+#LABEL disk1
+# localboot 0x80
+
+#LABEL disk2
+# localboot 0x81
+
+#LABEL nextboot
+# localboot -1
+
PROMPT 1
TIMEOUT 0