diff options
22 files changed, 6 insertions, 460 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 968d25081..4bcbda80d 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -335,7 +335,8 @@ case "${LH_BINARY_IMAGES}" in ;; esac - cp -r "${TEMPLATES}"/* binary/isolinux + cp -r "${TEMPLATES}"/common/* binary/isolinux + cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* binary/isolinux for FILE in binary/isolinux/*.live do @@ -436,7 +437,8 @@ case "${LH_BINARY_IMAGES}" in esac mkdir -p tftpboot/pxelinux.cfg - cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg + cp -r "${TEMPLATES}"/common/* tftpboot/pxelinux.cfg + cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* tftpboot/pxelinux.cfg for FILE in tftpboot/pxelinux.cfg/*.live do @@ -533,7 +535,8 @@ case "${LH_BINARY_IMAGES}" in ;; esac - cp -r "${TEMPLATES}"/* "${DESTDIR}" + cp -r "${TEMPLATES}"/common/* "${DESTDIR}" + cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* "${DESTDIR}" for FILE in "${DESTDIR}"/*.live do diff --git a/templates/syslinux/boot.txt b/templates/syslinux/boot.txt deleted file mode 100644 index 56dffcade..000000000 --- a/templates/syslinux/boot.txt +++ /dev/null @@ -1,3 +0,0 @@ -splash.rle - -Press F1control and F then 1 for help, or ENTER to diff --git a/templates/syslinux/splash.rle b/templates/syslinux/common/splash.rle Binary files differindex df3e15de2..df3e15de2 100644 --- a/templates/syslinux/splash.rle +++ b/templates/syslinux/common/splash.rle diff --git a/templates/syslinux/f1.txt.install b/templates/syslinux/f1.txt.install deleted file mode 100644 index 80026b6d2..000000000 --- a/templates/syslinux/f1.txt.install +++ /dev/null @@ -1,25 +0,0 @@ - 0fWelcome to Debian GNU/Linux!07 09F107 - -This is a Debian LH_DISTRIBUTION combined live and installation LH_MEDIA. -It was built on LH_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 LH_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.live b/templates/syslinux/f1.txt.live deleted file mode 100644 index f6f33ef71..000000000 --- a/templates/syslinux/f1.txt.live +++ /dev/null @@ -1,25 +0,0 @@ - 0fWelcome to Debian GNU/Linux!07 09F107 - -This is a Debian LH_DISTRIBUTION live LH_MEDIA. -It was built on LH_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 LH_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 diff --git a/templates/syslinux/f10.txt b/templates/syslinux/f10.txt deleted file mode 100644 index 3cf379e1b..000000000 --- a/templates/syslinux/f10.txt +++ /dev/null @@ -1,23 +0,0 @@ - 0fCOPYRIGHTS AND WARRANTIES07 09F1007 - -Debian GNU/Linux is Copyright (C) 1993-2007 Software in the Public Interest, -and others. - -The Debian GNU/Linux system is freely redistributable. After installation, -the exact distribution terms for each package are described in the -corresponding file /usr/share/doc/0bpackagename07/copyright. - -Debian GNU/Linux comes with 0fABSOLUTELY NO WARRANTY07, to the extent -permitted by applicable law. - ---- - -This Debian Live system was built with live-helper, version LH_VERSION. - -More information about the Debian Live project can be found at -<http://debian-live.alioth.debian.org/>. - - - - -Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f2.txt.install b/templates/syslinux/f2.txt.install deleted file mode 100644 index 12c0b224d..000000000 --- a/templates/syslinux/f2.txt.install +++ /dev/null @@ -1,23 +0,0 @@ - 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 diff --git a/templates/syslinux/f2.txt.live b/templates/syslinux/f2.txt.live deleted file mode 100644 index f79062ada..000000000 --- a/templates/syslinux/f2.txt.live +++ /dev/null @@ -1,23 +0,0 @@ - 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.install b/templates/syslinux/f3.txt.install deleted file mode 100644 index 233f267d2..000000000 --- a/templates/syslinux/f3.txt.install +++ /dev/null @@ -1,23 +0,0 @@ - 0fBOOT METHODS07 09F307 - -0fAvailable boot methods:07 - -0flive07 - Start the live system -- this is the default LH_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 diff --git a/templates/syslinux/f3.txt.install.g-i b/templates/syslinux/f3.txt.install.g-i deleted file mode 100644 index 745685d30..000000000 --- a/templates/syslinux/f3.txt.install.g-i +++ /dev/null @@ -1,23 +0,0 @@ - 0fBOOT METHODS07 09F307 - -0fAvailable boot methods:07 - -0flive07 - Start the live system -- this is the default LH_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 deleted file mode 100644 index b48ab8d08..000000000 --- a/templates/syslinux/f3.txt.live +++ /dev/null @@ -1,23 +0,0 @@ - 0fBOOT METHODS07 09F307 - -0fAvailable boot methods:07 - -0flive07 - Start the live system -- this is the default LH_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 deleted file mode 100644 index 106c30e58..000000000 --- a/templates/syslinux/f4.txt.install +++ /dev/null @@ -1,23 +0,0 @@ - 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.install.g-i b/templates/syslinux/f4.txt.install.g-i deleted file mode 100644 index db29ea640..000000000 --- a/templates/syslinux/f4.txt.install.g-i +++ /dev/null @@ -1,23 +0,0 @@ - 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 diff --git a/templates/syslinux/f4.txt.live b/templates/syslinux/f4.txt.live deleted file mode 100644 index 6a76aca58..000000000 --- a/templates/syslinux/f4.txt.live +++ /dev/null @@ -1,23 +0,0 @@ - 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 deleted file mode 100644 index 58bbb94c3..000000000 --- a/templates/syslinux/f5.txt +++ /dev/null @@ -1,23 +0,0 @@ - 0fSPECIAL BOOT PARAMETERS - OVERVIEW07 09F507 - -On a few systems, you may need to specify a parameter at the 0fboot:07 -prompt in order to boot the system. For example, Linux may not be able -to autodetect your hardware, and you may need to explicitly specify -its location or type for it to be recognized. - -For more information about what boot parameters you can use, press: - - <09F607> -- boot parameters for special machines - <09F707> -- boot parameters for various disk controllers - <09F807> -- boot parameters understood by the install system - -Note that to specify a parameter for a particular kernel module, use the form -module.param=value, for example: libata.atapi_enabled=1 - - - - - - - -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 deleted file mode 100644 index 772fd5091..000000000 --- a/templates/syslinux/f6.txt +++ /dev/null @@ -1,23 +0,0 @@ - 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F607 - -You can use the following boot parameters at the 0fboot:07 prompt, -in combination with the boot method (see <09F307>). -If you use hex numbers you have to use the 0x prefix (e.g., 0x300). -0f -HARDWARE PARAMETER TO SPECIFY07 -IBM PS/1 or ValuePoint (IDE disk) 0fhd=0bcylinders0f,0bheads0f,0bsectors07 -Some IBM ThinkPads 0ffloppy.floppy=thinkpad07 -Protect I/O port regions 0freserve=0biobase0f,0bextent07[0f,0b...07] -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 - -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 diff --git a/templates/syslinux/f7.txt b/templates/syslinux/f7.txt deleted file mode 100644 index 58ee46374..000000000 --- a/templates/syslinux/f7.txt +++ /dev/null @@ -1,23 +0,0 @@ - 0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07 09F707 - -You can use the following boot parameters at the 0fboot:07 prompt, -in combination with the boot method (see <09F307>). -0f -HARDWARE PARAMETER TO SPECIFY07 -Adaptec 151x, 152x 0faha152x.aha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]] -Adaptec 1542 0faha1542.aha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]] -Adaptec 274x, 284x 0faic7xxx.aic7xxx=no_reset07 (enabled if non-zero) -BusLogic SCSI Hosts 0fBusLogic.BusLogic=0biobase07 -Certain DELL machines 0faic7xxx.aic7xxx=no_probe07 - -This list is incomplete, see the kernel's kernel-parameters.txt file -for more. - - - - - -For example: - boot: install aic7xxx.aic7xxx=no_probe - -Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f8.txt.install b/templates/syslinux/f8.txt.install deleted file mode 100644 index 82ee2b4b2..000000000 --- a/templates/syslinux/f8.txt.install +++ /dev/null @@ -1,23 +0,0 @@ - 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 09F807 - -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 -RESULT PARAMETER07 -Verbose debugging 0fDEBCONF_DEBUG=507 -Debug boot sequence 0fBOOT_DEBUG=2|307 -Disable framebuffer 0ffb=false07 -Don't start PCMCIA 0fhw-detect/start_pcmcia=false07 -Force static network config 0fnetcfg/disable_dhcp=true07 -Set keyboard map 0fbootkbd=es07 -Use Braille tty 0fbrltty=driver,device,texttable07 -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 diff --git a/templates/syslinux/f8.txt.live b/templates/syslinux/f8.txt.live deleted file mode 100644 index 3dfc3e5d9..000000000 --- a/templates/syslinux/f8.txt.live +++ /dev/null @@ -1,23 +0,0 @@ - 0fSPECIAL BOOT PARAMETERS07 09F807 - - - - - - - - - - - - - - - - - - - - - -Press F1control and F then 1 for the help index, or ENTER to diff --git a/templates/syslinux/f9.txt.install b/templates/syslinux/f9.txt.install deleted file mode 100644 index dd7bc2adf..000000000 --- a/templates/syslinux/f9.txt.install +++ /dev/null @@ -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 - -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 diff --git a/templates/syslinux/f9.txt.live b/templates/syslinux/f9.txt.live deleted file mode 100644 index 5b8e8af16..000000000 --- a/templates/syslinux/f9.txt.live +++ /dev/null @@ -1,23 +0,0 @@ - 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 diff --git a/templates/syslinux/syslinux.cfg b/templates/syslinux/syslinux.cfg deleted file mode 100644 index 6c3ba7f88..000000000 --- a/templates/syslinux/syslinux.cfg +++ /dev/null @@ -1,36 +0,0 @@ - -DISPLAY boot.txt - -F1 f1.txt -F2 f2.txt -F3 f3.txt -F4 f4.txt -F5 f5.txt -F6 f6.txt -F7 f7.txt -F8 f8.txt -F9 f9.txt -F0 f10.txt - -DEFAULT live - -LINUX_LIVE - -LINUX_INSTALL - -MEMTEST - -LABEL floppy - localboot 0x00 - -LABEL disk1 - localboot 0x80 - -LABEL disk2 - localboot 0x81 - -LABEL nextboot - localboot -1 - -PROMPT 1 -TIMEOUT LINUX_TIMEOUT |