From 672f9f0170c5ccdd77dd342ae749dfc56af08de5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Dec 2003 17:30:44 +0000 Subject: [PATCH] - Merge in d-i iso/syslinux help files from d-i CVS to data/sarge. Expand ${DEBIAN_VERSION}, ${MEDIA_TYPE}, and ${BUILD_DATE} Only f3.txt varies (due to net boot type). Closes: #220612, #221186 - Add "expert" mode to isolinux.cfg for sarge. --- data/sarge/f1.txt | 19 +++++++++---------- data/sarge/f10.txt | 20 ++++++++++---------- data/sarge/f2.txt | 19 +++++++++---------- data/sarge/f3.txt | 18 +++++++++++++++--- data/sarge/f4.txt | 29 ++++++++++++++--------------- data/sarge/f5.txt | 21 ++++++++++----------- data/sarge/f6.txt | 15 +++++++-------- data/sarge/f7.txt | 29 ++++++++++++++--------------- data/sarge/f8.txt | 33 ++++++++++++++++----------------- data/sarge/f9.txt | 33 ++++++++++++++++----------------- data/sarge/isolinux.txt | 27 ++++++++++++++------------- debian/changelog | 8 +++++++- tools/boot/sarge/boot-i386 | 14 ++++++++++++-- 13 files changed, 153 insertions(+), 132 deletions(-) diff --git a/data/sarge/f1.txt b/data/sarge/f1.txt index 8e2e9252..3ca8a07d 100644 --- a/data/sarge/f1.txt +++ b/data/sarge/f1.txt @@ -1,24 +1,23 @@ - 0fHELP INDEX:07 + 0fHELP INDEX07 Press the function keys <09F107> through <09F1007> for helpful information. 0fKEY TOPIC07 <09F107> This page, the help index. -<09F207> Prerequisites for installing this system. -<09F307> Boot methods for special ways of using this Rescue disk. -<09F407> Special boot arguments, overview. -<09F507> Special boot arguments for special machines. -<09F607> Special boot arguments for selected disk controllers. -<09F707> Special boot arguments for the install system. +<09F207> Prerequisites for installing Debian. +<09F307> Boot methods for special ways of using this ${MEDIA_TYPE} +<09F407> Special boot parameters, overview. +<09F507> Special boot parameters for special machines. +<09F607> Special boot parameters for selected disk controllers. +<09F707> Special boot parameters for the install system. <09F807> How to get help. -<09F907> Debian e-mail lists. +<09F907> About the Debian project. <09F1007> Copyrights and warranties. - -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press any of <09F207> through <09F1007> for quick installation help. diff --git a/data/sarge/f10.txt b/data/sarge/f10.txt index 0571bfad..064d5d26 100644 --- a/data/sarge/f10.txt +++ b/data/sarge/f10.txt @@ -1,14 +1,11 @@ 0fCOPYRIGHTS AND WARRANTIES07 +Debian GNU/Linux is Copyright (C) 1993-2003 Software in the Public Interest, +and others. -Copyright (C) 1993-2002 Software in the Public Interest, and others. - -The 09Debian GNU/Linux07 system is freely redistributable. You may find -a few programs distributed with Debian in directories named "non-free" -that are 0fnot07 freely redistributable, but none of these are critical -components of the system. After installation, the exact distribution -terms for each program are described in the corresponding file -/usr/share/doc/0bpackagename07/copyright. +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. @@ -19,5 +16,8 @@ permitted by applicable law. -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. -Press function key <09F107> for the help index. + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. +Press <09F107> for the help index. + diff --git a/data/sarge/f2.txt b/data/sarge/f2.txt index 1ad26a43..4d841efd 100644 --- a/data/sarge/f2.txt +++ b/data/sarge/f2.txt @@ -1,17 +1,14 @@ - 0fPREREQUISITES FOR INSTALLING THIS SYSTEM07 + 0fPREREQUISITES FOR INSTALLING DEBIAN07 -You must have at least twelve megabytes of RAM and swap space, or 14MB -if not using swap; there is no low memory boot disk any longer. +You must have at least 64 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 64 megabytes and swap space 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. +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 located in the /doc directory on this CD-ROM. - -They are also available at the Debian web site, http://www.debian.org/ +documents are available at the Debian web site, 0fhttp://www.debian.org/07 @@ -19,6 +16,8 @@ They are also available at the Debian web site, http://www.debian.org/ -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f3.txt b/data/sarge/f3.txt index ea4b32c2..2a3d1d73 100644 --- a/data/sarge/f3.txt +++ b/data/sarge/f3.txt @@ -1,11 +1,23 @@ 0fBOOT METHODS07 + 0fAvailable boot methods:07 -0flinux07 or 0fcdrom07 - Start the installation -- this is the default CDROM install. + +0flinux07 + Start the installation -- this is the default ${MEDIA_TYPE} install. 0fnet07 Start the installation for a network install. +0fexpert07 + Start the installation in expert mode, for maximum control. -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + + + + + + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f4.txt b/data/sarge/f4.txt index 4651c29c..f1f5dc39 100644 --- a/data/sarge/f4.txt +++ b/data/sarge/f4.txt @@ -1,24 +1,23 @@ - 0fSPECIAL BOOT ARGUMENTS - OVERVIEW07 + 0fSPECIAL BOOT PARAMETERS - OVERVIEW07 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 will need to explicitly specify -its location or type for it to be recognized. The table below -indicates whether you need a parameter. If you do, enter the 0fboot -method07 followed by the parameter from the table. For example, if your -3.5 inch floppy drive is your second drive, and your first drive is a -5.25 inch one, you would type "0flinux root=/dev/fd107" at the 0fboot:07 -prompt. Some of the arguments require numerical parameters which are -shown in 0bcyan07. By default, these are interpreted as decimal. If you use -hex numbers you have to add a 0x prefix (e.g., 0x300). +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 arguments you can use, press: +For more information about what boot parameters you can use, press: - <09F507> -- boot arguments for special machines - <09F607> -- boot arguments for various disk controllers - <09F707> -- boot arguments understood by the install system + <09F507> -- boot parameters for special machines + <09F607> -- boot parameters for various disk controllers + <09F707> -- boot parameters understood by the install system + +Many kernel modules are loaded dynamically by the installer, and parameters +for those modules cannot be given on the command line. To be prompted for +parameters when modules are loaded, boot in expert mode (see <09F307>). -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f5.txt b/data/sarge/f5.txt index 40609358..eff4bfe7 100644 --- a/data/sarge/f5.txt +++ b/data/sarge/f5.txt @@ -1,24 +1,23 @@ - 0fSPECIAL BOOT ARGUMENTS - VARIOUS HARDWARE07 + 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 -You can use the following boot arguments 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>). If you use hex numbers you have to use the 0x prefix (e.g., 0x300). - -0fHARDWARE PARAMETER TO SPECIFY07 -Monochrome monitor 0fmono07 -Disable framebuffer for monitor 0fvideo=vga16:off07 +0f +HARDWARE PARAMETER TO SPECIFY07 IBM PS/1 or ValuePoint (IDE disk) 0fhd=0bcylinders0f,0bheads0f,0bsectors07 IBM ThinkPad 0ffloppy=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 Advanced Power Management 0fapm=on07 +If your system hangs when booting, and the last message you see is +"aec671x-detect..", try 0fgdth=disable:y07 -0fEthernet:07 -Some ethernet and proprietary CD-ROM drivers are loaded as modules. -For such drivers, give parameters for them during the installation -process, not at boot. See the Installation Manual for details. -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f6.txt b/data/sarge/f6.txt index 1a2e4d9c..a0effd2e 100644 --- a/data/sarge/f6.txt +++ b/data/sarge/f6.txt @@ -1,13 +1,12 @@ - 0fSPECIAL BOOT ARGUMENTS - VARIOUS DISK DRIVES07 + 0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07 -You can use the following boot arguments 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>). - -0fHARDWARE PARAMETER TO SPECIFY07 +0f +HARDWARE PARAMETER TO SPECIFY07 Adaptec 151x, 152x 0faha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]] Adaptec 1542 0faha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]] Adaptec 274x, 284x 0faic7xxx=no_reset07 (enabled if non-zero) -USB keyboard (floppy boot) 0fkeytimer07 (keep root floppy ready) BusLogic SCSI Hosts 0fbuslogic=0biobase07 Certain DELL machines 0faic7xxx=no_probe07 Future Domain TMC-8xx/950 0ftmc8xx=0bmem_base0f,0birq07 @@ -16,9 +15,9 @@ Pro Audio Spectrum 0fpas16=0biobase0f,0birq07 PS/2 ESDI (MCA) 0fed=0bcyl0f,0bhead0f,0bsec07 Seagate ST-0x 0fst0x=0bmem_base0f,0birq07 Trantor T128 0ft128=0bmem_base0f,0birq07 -If your system hangs when booting, and the last message you see is -"aec671x-detect..", try 0fgdth=disable:y07 -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f7.txt b/data/sarge/f7.txt index 3f904d7e..9af5c6bd 100644 --- a/data/sarge/f7.txt +++ b/data/sarge/f7.txt @@ -1,24 +1,23 @@ - 0fSPECIAL BOOT ARGUMENTS - INSTALLATION SYSTEM07 + 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 -You can use the following boot arguments 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). - -These arguments are used by the installation system to specify -how the installation system should be run. - -0fARGUMENT MEANING07 -0fquiet07 Quiet mode; fewer prompts -0fverbose07 Verbose mode; more prompts -0fdebug07 Debugging mode; look at tty3 for messages. -0fbootkbd07 Set the keyboard translation to use, e.g., - 0fbootkbd=qwerty/us07 +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=107 +Disable framebuffer 0fdebian-installer/framebuffer=false07 +Set keyboard map 0fbootkbd=es07 -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f8.txt b/data/sarge/f8.txt index 53af6121..445d5ece 100644 --- a/data/sarge/f8.txt +++ b/data/sarge/f8.txt @@ -1,24 +1,23 @@ 0fGETTING HELP07 -If you can't install the system, 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! +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! -If you encounter a problem it will fall into one of two areas: the -base system installation, which ends when you start selecting packages -to install; or the installation of packages from the Debian distribution. +Problems with installation can be emailed to the Debian Boot team at +0fdebian-boot@lists.debian.org07. Or join us on irc, on the +0firc.debian.org07 server, channel 0f#debian-boot07. -Problems with installation of the base system should be addressed to -the Debian Boot Team at 0fdebian-boot@lists.debian.org07. Problems -installing packages should be directed to 0fdebian-user@lists.debian.org07. -In either case your message should contain a detailed explanation of -your problem, including the text of any system error messages that you -think might be relevant to the problem. Press function key <09F907> for -more detailed information about these and other Debian e-mail lists. +Be sure to include a detailed explanation of your problem, including +a description of the hardware you are using, and the text of any system +error messages that you think might be relevant to the problem. -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/f9.txt b/data/sarge/f9.txt index 64930a41..fb9294c2 100644 --- a/data/sarge/f9.txt +++ b/data/sarge/f9.txt @@ -1,24 +1,23 @@ - 0fDEBIAN E-MAIL LISTS07 + 0fABOUT THE DEBIAN PROJECT07 -If you have WWW access, you might want to first look at our Web page -0fhttp://www.debian.org/07, follow the link labeled 0fMailing List -Subscription07 to see an overview of the 80+ lists associated with The -Debian Project. A convenient subscription form is available on the -0fMailing List Subscription07 web page. +For information about the Debian project, see our web site: +0fhttp://www.debian.org/07 -If you know the name of list you are interested in, you can subscribe manually -by sending an e-mail message to 0fdebian--REQUEST@lists.debian.org07 -containing the word "0fsubscribe07". Communication with other subscribers to -the list is through the 0fdebian-@lists.debian.org07 e-mail address. -Where is replaced with the name of the e-mail list of interest. +For copyright information, press <09F1007>. -For example, if you wish to report a problem or need help with installation -of Debian packages: send the word "0fsubscribe07" in a message to -0fdebian-user-REQUEST@lists.debian.org07; then send a detailed explanation -of your problem to 0fdebian-user@lists.debian.org07. Your message will be -read by hundreds of Debian users, and someone will be sure to help. +Thank you for choosing Debian! -Press <09ENTER07> or type boot method, arguments, and <09ENTER07> to boot. + + + + + + + + + + +Press <09ENTER07> or type boot method, parameters, and <09ENTER07> to boot. Press function key <09F107> for the help index. diff --git a/data/sarge/isolinux.txt b/data/sarge/isolinux.txt index c6ceee19..5ea2b1de 100644 --- a/data/sarge/isolinux.txt +++ b/data/sarge/isolinux.txt @@ -1,22 +1,23 @@ - 0fWelcome to 0bDebian GNU/Linux sarge0f!07 + 0fWelcome to Debian GNU/Linux ${DEBIAN_VERSION}!07 -This is a Debian CD-ROM. Keep it available once you have installed -your system, as you can boot from it to repair the system on your hard -disk if that ever becomes necessary (press <09F307> for details). +This is a Debian installation ${MEDIA_TYPE}, built on ${BUILD_DATE}. -If you want additional features, specify a -different boot flavor at the boot prompt (press <09F307> to get an overview). If you run into trouble or if you already have questions, press <09F107> -for quick installation help. +for quick installation help. For documentation about boot parameters, +press <09F407>. 0fWARNING07: You should completely back up all of your hard disks before - proceeding. The installation procedure can completely and 0cirreversibly07 - erase them! If you haven't made backups yet, remove the CD-ROM - from the drive and press <09RESET07> or <09Control-Alt-Del07> to get back to - your old system. + proceeding. The installation procedure can completely and + 0cirreversibly07 erase them! If you haven't made backups yet, + remove the ${MEDIA_TYPE} and press <09RESET07> or + <09Control-Alt-Delete07> to return to your old system. + +Debian GNU/Linux comes with 0fABSOLUTELY NO WARRANTY07, to the extent +permitted by applicable law. For copyright information, press <09F1007>. + + + -0bDebian GNU/Linux07 comes with 0fABSOLUTELY NO WARRANTY07, to the extent -permitted by applicable law. For copyright information, press <09F1007>. Press <09F107> for help, or <09ENTER07> to boot. diff --git a/debian/changelog b/debian/changelog index b2d360ac..15ff4bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,13 @@ debian-cd (2.2.17) UNRELEASED; urgency=low It is already on CD1 of a normal CD set. * Kenshi Muto - Add jfbterm, unifont into forcd1 (second stage of debian-installer needs - them). + them). + * Joey Hess + - Merge in d-i iso/syslinux help files from d-i CVS to data/sarge. + Expand ${DEBIAN_VERSION}, ${MEDIA_TYPE}, and ${BUILD_DATE} + Only f3.txt varies (due to net boot type). + Closes: #220612, #221186 + - Add "expert" mode to isolinux.cfg for sarge. -- Raphael Hertzog Wed, 20 Aug 2003 20:17:06 +0200 diff --git a/tools/boot/sarge/boot-i386 b/tools/boot/sarge/boot-i386 index 89013b5a..a22480b8 100755 --- a/tools/boot/sarge/boot-i386 +++ b/tools/boot/sarge/boot-i386 @@ -90,8 +90,15 @@ gzip -dc $BASEDIR/data/$CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin # Keep the original file timestamp touch -r $BASEDIR/data/$CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin cp -p $BASEDIR/data/$CODENAME/README.sbm $CDDIR/install/ -# Isolinux config files -cp -f $BASEDIR/data/$CODENAME/isolinux.txt $BASEDIR/data/$CODENAME/f*.txt boot$N/isolinux/ +# Isolinux help files come from the d-i tree (mostly). +BUILD_DATE=$(date +%Y%m%d) +for file in $BASEDIR/data/$CODENAME/isolinux.txt $BASEDIR/data/$CODENAME/f*.txt; do + sed -e "s/\${MEDIA_TYPE}/CDROM/" \ + -e "s/\${DEBIAN_VERSION}/${CODENAME}/" \ + -e "s/\${BUILD_DATE}/${BUILD_DATE}/" \ + < $file > boot$N/isolinux/$(basename $file) +done +# Isolinux config file. cat > boot$N/isolinux/isolinux.cfg <