Adding live-helper 1.0~a20-1.

18 files changed, 215 insertions, 52 deletions

diff --git a/templates/syslinux/boot.txt b/templates/syslinux/boot.txt
index 2fe3eade7..56dffcade 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 000000000..a26234f33
--- /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 2e8656cf8..5a6aecff3 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 60243d348..12c0b224d 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 000000000..f79062ada
--- /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 5f3996f8f..db597170f 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 000000000..445ddbd0c
--- /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 000000000..397c64933
--- /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 000000000..106c30e58
--- /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 1167738c1..db29ea640 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 000000000..6a76aca58
--- /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 6e73913f4..58bbb94c3 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 4bdb09a03..772fd5091 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 48f76c934..cd7ca7ed4 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 04341b621..bc4069626 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 b0cac8dfa..b6acea64e 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 000000000..f39ec3765
--- /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 733a5ebdb..48599ed08 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