diff options
Diffstat (limited to 'en')
25 files changed, 29 insertions, 508 deletions
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index 6dd075af2..e4b7c2505 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -304,7 +304,6 @@ Here is a sample you can modify to suit: /dev/XXX none swap sw 0 0 proc /proc proc defaults 0 0 -/dev/fd0 /media/floppy auto noauto,rw,sync,user,exec 0 0 /dev/cdrom /media/cdrom iso9660 noauto,ro,user,exec 0 0 /dev/XXX /tmp ext3 rw,nosuid,nodev 0 2 diff --git a/en/appendix/files.xml b/en/appendix/files.xml index 9ecbce948..0103afd2a 100644 --- a/en/appendix/files.xml +++ b/en/appendix/files.xml @@ -18,16 +18,6 @@ The most important device files are listed in the tables below. <informaltable><tgroup cols="2"><tbody> <row> - <entry><filename>fd0</filename></entry> - <entry>First Floppy Drive</entry> -</row><row> - <entry><filename>fd1</filename></entry> - <entry>Second Floppy Drive</entry> -</row> -</tbody></tgroup></informaltable> - -<informaltable><tgroup cols="2"><tbody> -<row> <entry><filename>sda</filename></entry> <entry>First hard disk</entry> </row><row> diff --git a/en/appendix/pppoe.xml b/en/appendix/pppoe.xml index a4610abbf..d2d6d1292 100644 --- a/en/appendix/pppoe.xml +++ b/en/appendix/pppoe.xml @@ -22,7 +22,7 @@ after the reboot into the installed system (see <xref linkend="boot-new"/>). To have the option of setting up and using PPPoE during the installation, you will need to install using one of the CD-ROM/DVD images that are available. It is not supported for other installation methods (e.g. -netboot<phrase condition="supports-floppy-boot"> or floppy</phrase>). +netboot). </para><para> diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index df8f2d841..1ec09a627 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -94,16 +94,6 @@ installation methods. <entry>yes</entry> <entry>yes</entry> <entry>yes<footnoteref linkend="apx-ps-net"/></entry> -</row><row condition="supports-floppy-boot"> - <entry>floppy based (cd-drivers)</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry>yes<footnoteref linkend="apx-ps-net"/></entry> -</row><row condition="supports-floppy-boot"> - <entry>floppy based (net-drivers)</entry> - <entry>yes</entry> - <entry>no</entry> - <entry>yes</entry> </row><row arch="s390"> <entry>generic</entry> <entry>yes</entry> @@ -231,7 +221,7 @@ You will first need to create a preconfiguration file and place it in the location from where you want to use it. Creating the preconfiguration file is covered later in this appendix. Putting it in the correct location is fairly straightforward for network preseeding or if you want to read the file off -a floppy or usb-stick. If you want to include the file on a CD or DVD, you +a usb-stick. If you want to include the file on a CD or DVD, you will have to remaster the ISO image. How to get the preconfiguration file included in the initrd is outside the scope of this document; please consult the developers' documentation for &d-i;. diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml index 663519371..68c1f61a5 100644 --- a/en/boot-installer/parameters.xml +++ b/en/boot-installer/parameters.xml @@ -204,24 +204,6 @@ debugging. Exit the shell to continue the boot. <varlistentry> -<term>INSTALL_MEDIA_DEV</term> -<listitem><para> - -The value of the parameter is the path to the device to load the -&debian; installer from. For example, -<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput> - -</para><para> - -The boot floppy, which normally scans all floppies it can to find the -root floppy, can be overridden by this parameter to only look at the -one device. - -</para></listitem> -</varlistentry> - - -<varlistentry> <term>log_host</term> <term>log_port</term> <listitem><para> diff --git a/en/boot-installer/powerpc.xml b/en/boot-installer/powerpc.xml index 65509892d..e8f16672e 100644 --- a/en/boot-installer/powerpc.xml +++ b/en/boot-installer/powerpc.xml @@ -1,6 +1,7 @@ <!-- retain these comments for translator revision tracking --> <!-- $Id$ --> +<!-- <sect2 arch="powerpc" id="boot-cd"><title>Booting from a CD-ROM</title> &boot-installer-intro-cd.xml; @@ -67,7 +68,6 @@ On YDL Powerstation machine, press <keycap>s</keycap> immediately after &boot-installer-intro-hd.xml; -<!-- <sect3><title>Booting CHRP from OpenFirmware</title> <para> @@ -76,7 +76,6 @@ On YDL Powerstation machine, press <keycap>s</keycap> immediately after </para> </sect3> ---> <sect3><title>Booting OldWorld PowerMacs from MacOS</title> <para> @@ -147,7 +146,7 @@ Make sure you have prepared everything from <xref linkend="boot-usb-files"/>. To boot a Macintosh system from a USB stick, you will need to use the Open Firmware prompt, since Open Firmware does not search USB storage devices by default. -<!-- TODO: although it could be made to; watch this space --> +TODO: although it could be made to; watch this space See <xref linkend="invoking-openfirmware"/>. </para><para> @@ -283,6 +282,7 @@ hardware, this changes to </para> </sect2> +--> <sect2 arch="ppc64el"> <title>Booting a ppc64el machine</title> <para> diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml index df8c51d55..6539fbe00 100644 --- a/en/boot-installer/trouble.xml +++ b/en/boot-installer/trouble.xml @@ -223,53 +223,6 @@ reliably. </sect3> </sect2> - <sect2 condition="supports-floppy-boot" id="unreliable-floppies"> - <title>Floppy Disk Reliability</title> - -<para> - -The biggest problem for people using floppy disks to install &debian; -seems to be floppy disk reliability. - -</para><para> - -The boot floppy is the floppy with the worst problems, because it -is read by the hardware directly, before Linux boots. Often, the -hardware doesn't read as reliably as the Linux floppy disk driver, and -may just stop without printing an error message if it reads incorrect -data. There can also be failures in the driver floppies, most of which -indicate themselves with a flood of messages about disk I/O errors. - -</para><para> - -If you are having the installation stall at a particular floppy, the first -thing you should do is write the image to a <emphasis>different</emphasis> -floppy and see if that solves the problem. Simply reformatting the old -floppy may not be sufficient, even if it appears that the floppy was -reformatted and written with no errors. It is sometimes useful to try -writing the floppy on a different system. - -</para><para> - -One user reports he had to write the images to floppy -<emphasis>three</emphasis> times before one worked, and then -everything was fine with the third floppy. - -</para><para> - -Normally you should not have to download a floppy image again, but if you -are experiencing problems it is always useful to verify that the images -were downloaded correctly by verifying their md5sums. - -</para><para> - -Other users have reported that simply rebooting a few times with the -same floppy in the floppy drive can lead to a successful boot. This is -all due to buggy hardware or firmware floppy drivers. - -</para> - </sect2> - <sect2><title>Boot Configuration</title> <para> @@ -328,12 +281,6 @@ passing certain boot parameters to the installer. <!-- outdated <para> -Some systems have floppies with <quote>inverted DCLs</quote>. If you receive -errors reading from the floppy, even when you know the floppy is good, -try the parameter <userinput>floppy=thinkpad</userinput>. - -</para><para> - On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk drivers), the IDE drive may not be properly recognized. Again, try it first without the parameters and see if the IDE drive is @@ -513,7 +460,7 @@ custom kernel later <phrase arch="linux-any">(see <xref linkend="kernel-baking"/ If you get through the initial boot phase but cannot complete the install, the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful. It lets you store system error logs and configuration information from the -installer to a floppy, or download them using a web browser. +installer on a storage medium, or download them using a web browser. This information may provide clues as to what went wrong and how to fix it. If you are submitting a bug report, you may want to attach @@ -564,7 +511,7 @@ installation reports, and file the report as a bug report against the <informalexample><screen> Package: installation-reports -Boot method: <How did you boot the installer? CD? floppy? network?> +Boot method: <How did you boot the installer? CD? USB stick? Network?> Image version: <Full URL to image you downloaded is best> Date: <Date and time of the install> diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index f203f7c7b..0b88d2417 100644 --- a/en/boot-installer/x86.xml +++ b/en/boot-installer/x86.xml @@ -196,65 +196,6 @@ or <command>LILO</command>. </para> </sect2> - <sect2 arch="x86" condition="supports-floppy-boot" id="floppy-boot"> - <title>Booting from Floppies</title> -<para> - -You will have already downloaded the floppy images you needed and -created floppies from the images in <xref linkend="create-floppy"/>. -<!-- missing-doc FIXME If you need to, you can also modify the boot floppy; see -<xref linkend="rescue-replace-kernel"/>. --> - -</para><para> - -To boot from the installer boot floppy, place it in the primary floppy -drive, shut down the system as you normally would, then turn it back -on. - -</para><para> - -For installing from an LS-120 drive (ATAPI version) with a set of -floppies, you need to specify the virtual location for the floppy -device. This is done with the <emphasis>root=</emphasis> boot -argument, giving the device that the ide-floppy driver maps the device -to. For example, if your LS-120 drive is connected as the first IDE -device (master) on the second cable, you enter -<userinput>install root=/dev/hdc</userinput> at the boot prompt. - -</para><para> - -Note that on some machines, <keycombo><keycap>Control</keycap> -<keycap>Alt</keycap> <keycap>Delete</keycap></keycombo> does not -properly reset the machine, so a <quote>hard</quote> reboot is recommended. If -you are installing from an existing operating system (e.g., from a DOS -box) you don't have a choice. Otherwise, please do a hard reboot when -booting. - -</para><para> - -The floppy disk will be accessed, and you should then see a screen -that introduces the boot floppy and ends with the <prompt>boot:</prompt> -prompt. - -</para><para> - -Once you press &enterkey;, you should see the message -<computeroutput>Loading...</computeroutput>, followed by -<computeroutput>Uncompressing Linux...</computeroutput>, and -then a screenfull or so of information about the hardware in your -system. More information on this phase of the boot process can be -found below in <xref linkend="kernel-msgs"/>. - -</para><para> - -After booting from the boot floppy, the root floppy is -requested. Insert the root floppy and press &enterkey;, and the -contents are loaded into memory. The installer program -<command>debian-installer</command> is automatically launched. - -</para> - </sect2> - <sect2 arch="x86" id="boot-tftp-x86"><title>Booting with TFTP</title> &boot-installer-intro-net.xml; diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml index 235ec58a5..0f9418a41 100644 --- a/en/hardware/installation-media.xml +++ b/en/hardware/installation-media.xml @@ -14,20 +14,6 @@ you reach that section. </para> - <sect2 condition="supports-floppy-boot"><title>Floppies</title> -<para> - -In some cases, you'll have to do your first boot from floppy disks. -Generally, all you will need is a -high-density (1440 kilobytes) 3.5 inch floppy drive. - -</para><para arch="powerpc"> - -For CHRP, floppy support is currently broken. - -</para> - </sect2> - <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM/BD-ROM</title> <note><para> @@ -194,17 +180,17 @@ IDE systems (such as the UltraSPARC 5) are also supported. See <ulink url="&url-sparc-linux-faq;">Linux for SPARC Processors FAQ</ulink> for more information on SPARC hardware supported by the Linux kernel. -</para><para arch="powerpc"> +<!-- </para><para arch="powerpc"> Any storage system supported by the Linux kernel is also supported by the boot system. Note that the current Linux kernel does not support -floppies on CHRP systems at all. +floppies on CHRP systems at all. --> -</para><para arch="hppa"> +<!-- </para><para arch="hppa"> Any storage system supported by the Linux kernel is also supported by the boot system. Note that the current Linux kernel does not support -the floppy drive. +the floppy drive. --> </para><para arch="mips;mipsel;mips64el"> diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index 609274930..fa8706968 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -87,45 +87,6 @@ To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See </para> </sect2> - <sect2 condition="supports-floppy-boot" id="howto-getting-images-floppy"> - <title>Floppy</title> -<para> - -If you can't boot from CD, you can download floppy images to install -&debian;. You need the <filename>floppy/boot.img</filename>, the -<filename>floppy/root.img</filename> and one or more of the driver disks. - -</para><para> - -The boot floppy is the one with <filename>boot.img</filename> on it. -This floppy, when booted, will prompt you to insert a second floppy — -use the one with <filename>root.img</filename> on it. - -</para><para> - -If you're planning to install over the network, you will usually need -the <filename>floppy/net-drivers-1.img</filename>. For PCMCIA or USB -networking, and some less common network cards, you will also need a second -driver floppy, <filename>floppy/net-drivers-2.img</filename>. - -</para><para> - -If you have a CD, but cannot boot from it, then boot from floppies and use -<filename>floppy/cd-drivers.img</filename> on a driver disk to complete the -install using the CD. - -</para><para> - -Floppy disks are one of the least reliable media around, so be prepared for -lots of bad disks (see <xref linkend="unreliable-floppies" />). Each -<filename>.img</filename> file you downloaded goes on a single floppy; -you can use the dd command to write it to /dev/fd0 or some other means -(see <xref linkend="create-floppy" /> for details). -Since you'll have more than one floppy, it's a good idea to label them. - -</para> - </sect2> - <sect2 condition="bootable-usb" id="howto-getting-images-usb"> <title>USB memory stick</title> <para> @@ -238,7 +199,7 @@ you know better. </para><para> Now sit back while debian-installer detects some of your hardware, and -loads the rest of itself from CD, floppy, USB, etc. +loads the rest of itself from CD, USB, etc. </para><para> diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml index 8c5cd16e0..820dd659c 100644 --- a/en/install-methods/boot-drive-files.xml +++ b/en/install-methods/boot-drive-files.xml @@ -13,8 +13,7 @@ system or by invoking a boot loader directly from the BIOS. A full, <quote>pure network</quote> installation can be achieved using this technique. This avoids all hassles of removable media, like finding -and burning CD images or struggling with too numerous and -unreliable floppy disks. +and burning CD images. </para><para arch="powerpc"> @@ -108,6 +107,7 @@ Copy the following directories from a &debian; CD image to <filename>c:\</filena </sect2> +<!-- <sect2 arch="powerpc" id="files-oldworld"> <title>Hard Disk Installer Booting for OldWorld Macs</title> <para> @@ -199,4 +199,5 @@ To boot the installer, proceed to <xref linkend="boot-newworld"/>. </para> </sect2> +--> </sect1> diff --git a/en/install-methods/create-floppy.xml b/en/install-methods/create-floppy.xml deleted file mode 100644 index 2610c834f..000000000 --- a/en/install-methods/create-floppy.xml +++ /dev/null @@ -1,108 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect1 condition="supports-floppy-boot" id="create-floppy"> - <title>Creating Floppies from Disk Images</title> -<para> - -Bootable floppy disks are generally used as a last resort to boot the -installer on hardware that cannot boot from CD or by other means. - -</para><para arch="powerpc"> - -Booting the installer from floppy disk reportedly fails on Mac USB -floppy drives. - -</para><para> - -Disk images are files containing the complete contents of a floppy -disk in <emphasis>raw</emphasis> form. Disk images, such as -<filename>boot.img</filename>, cannot simply be copied to floppy -drives. A special program is used to write the image files to floppy -disk in <emphasis>raw</emphasis> mode. This is required because these -images are raw representations of the disk; it is required to do a -<emphasis>sector copy</emphasis> of the data from the file onto the -floppy. - -</para><para> - -There are different techniques for creating floppies from disk images. -This section describes how to create floppies from disk images on -different platforms. - -</para><para> - -Before you can create the floppies, you will first need to download them -from one of the &debian; mirrors, as explained in -<xref linkend="downloading-files"/>. <phrase arch="i386">If you already -have an installation CD-ROM or DVD, the floppy images may also be included -on the CD/DVD.</phrase> - -</para><para> - -No matter which method you use to create your floppies, you should -remember to flip the write-protect tab on the floppies once you have -written them, to ensure they are not damaged unintentionally. - -</para> - - <sect2><title>Writing Disk Images From a Linux or Unix System</title> -<para> - -To write the floppy disk image files to the floppy disks, you will -probably need root access to the system. Place a good, blank floppy -in the floppy drive. Next, use the command - -<informalexample><screen> -$ dd if=<replaceable>filename</replaceable> of=/dev/fd0 bs=1024 conv=sync ; sync -</screen></informalexample> - -where <replaceable>filename</replaceable> is one of the floppy disk image -files. -<filename>/dev/fd0</filename> is a commonly used name of the floppy -disk device, it may be different on your workstation<phrase arch="sparc"> -(on Solaris, it is <filename>/dev/fd/0</filename>)</phrase>. -The command may return to the -prompt before Unix has finished writing the floppy disk, so look for -the disk-in-use light on the floppy drive and be sure that the light -is out and the disk has stopped revolving before you remove it from -the drive. On some systems, you'll have to run a command to eject the -floppy from the drive <phrase arch="sparc"> (on Solaris, use -<command>eject</command>, see the manual page)</phrase>. - -</para><para> - -Some systems attempt to automatically mount a floppy disk when you -place it in the drive. You might have to disable this feature before -the workstation will allow you to write a floppy in <emphasis>raw -mode</emphasis>. Unfortunately, how to accomplish this will vary -based on your operating system. -<phrase arch="sparc"> -On Solaris, you can work around -volume management to get raw access to the floppy. First, make sure -that the floppy is auto-mounted (using <command>volcheck</command> or -the equivalent command in the file manager). Then use a -<command>dd</command> command of the form given above, just replace -<filename>/dev/fd0</filename> with -<filename>/vol/rdsk/<replaceable>floppy_name</replaceable></filename>, -where <replaceable>floppy_name</replaceable> is the name the floppy -disk was given when it was formatted (unnamed floppies default to the -name <filename>unnamed_floppy</filename>). On other systems, ask your -system administrator. -</phrase> - -</para><para arch="powerpc"> - -If writing a floppy on powerpc Linux, you will need to eject it. The -<command>eject</command> program handles this nicely; you might need -to install it. - -</para> - - </sect2> - -&floppy-i386.xml; <!-- can be used for other arches --> -&floppy-powerpc.xml; - - </sect1> - diff --git a/en/install-methods/floppy/i386.xml b/en/install-methods/floppy/i386.xml deleted file mode 100644 index 158057aa4..000000000 --- a/en/install-methods/floppy/i386.xml +++ /dev/null @@ -1,35 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - -<!-- This is not set off for i386 only, because many people will have --> -<!-- access to a PC in order to make a floppy for other arches. --> - - <sect2><title>Writing Disk Images From DOS, Windows, or OS/2</title> - -<para> - -If you have access to an i386 or amd64 machine, you can use one of the -following programs to copy images to floppies. - -</para><para> - -The <command>rawrite1</command> and <command>rawrite2</command> programs -can be used under MS-DOS. To use these programs, first make sure that you -are booted into DOS. Trying to use these programs from within a DOS box in -Windows, or double-clicking on these programs from the Windows Explorer is -<emphasis>not</emphasis> expected to work. - -</para><para> - -The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, -ME, XP and probably later versions. To use it you will need to unpack -diskio.dll in the same directory. - -</para><para> - -These tools can be found on the Official &debian; CD-ROMs under the -<filename>/tools</filename> directory. - -</para> - </sect2> diff --git a/en/install-methods/floppy/powerpc.xml b/en/install-methods/floppy/powerpc.xml deleted file mode 100644 index 1a29c1043..000000000 --- a/en/install-methods/floppy/powerpc.xml +++ /dev/null @@ -1,122 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - - <sect2 arch="powerpc"><title>Writing Disk Images From MacOS</title> -<para> - -An AppleScript, <application>Make &debian; Floppy</application>, is -available for burning floppies from the provided disk image files. It -can be downloaded from -<ulink url="ftp://ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit"></ulink>. To -use it, just unstuff it on your desktop, and then drag any floppy -image file to it. You must have Applescript installed and enabled in -your extensions manager. Disk Copy will ask you to confirm that you -wish to erase the floppy and proceed to write the file image to it. - -</para><para> - -You can also use the MacOS utility <command>Disk Copy</command> -directly, or the freeware utility <command>suntar</command>. The -<filename>root.bin</filename> file is an example of a floppy -image. Use one of the following methods to create a floppy from the -floppy image with these utilities. - -</para> - - <sect3> - <title>Writing Disk Images with <command>Disk Copy</command></title> -<para> - -If you are creating the floppy image from files which were originally -on the official &debian-gnu; CD, then the Type and Creator are already set -correctly. The following <command>Creator-Changer</command> steps are -only necessary if you downloaded the image files from a &debian; mirror. - -</para> -<orderedlist> -<listitem><para> - -Obtain -<ulink url="&url-powerpc-creator-changer;">Creator-Changer</ulink> -and use it to open the <filename>root.bin</filename> file. - -</para></listitem> -<listitem><para> - -Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the -Type to <userinput>DDim</userinput> (binary floppy image). The case is -sensitive for these fields. - -</para></listitem> -<listitem><para> - -<emphasis>Important:</emphasis> In the Finder, use <userinput>Get -Info</userinput> to display the Finder information about the floppy -image, and <quote>X</quote> the <userinput>File Locked</userinput> check box so -that MacOS will be unable to remove the boot blocks if the image is -accidentally mounted. - -</para></listitem> - <listitem><para> - -Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it -will very likely be there already, otherwise try -<ulink url="&url-powerpc-diskcopy;"></ulink>. - -</para></listitem> -<listitem><para> - -Run <command>Disk Copy</command>, and select <menuchoice> -<guimenu>Utilities</guimenu> <guimenuitem>Make a Floppy</guimenuitem> -</menuchoice>, then select the -<emphasis>locked</emphasis> image file from the resulting dialog. It -will ask you to insert a floppy, then ask if you really want to erase -it. When done it should eject the floppy. - -</para></listitem> -</orderedlist> - - </sect3> - - <sect3> - <title>Writing Disk Images with <command>suntar</command></title> -<para> - -<orderedlist> -<listitem><para> - -Obtain <command>suntar</command> from <ulink url="&url-powerpc-suntar;"> -</ulink>. Start the <command>suntar</command> program and select -<quote>Overwrite Sectors...</quote> from the <userinput>Special</userinput> -menu. - -</para></listitem> -<listitem><para> - -Insert the floppy disk as requested, then hit &enterkey; (start at -sector 0). - -</para></listitem> -<listitem><para> - -Select the <filename>root.bin</filename> file in the file-opening dialog. - -</para></listitem> -<listitem><para> - -After the floppy has been created successfully, select <menuchoice> -<guimenu>File</guimenu> <guimenuitem>Eject</guimenuitem> </menuchoice>. -If there are any errors writing the floppy, simply toss that floppy and -try another. - -</para></listitem> -</orderedlist> - -Before using the floppy you created, <emphasis>set the write protect -tab</emphasis>! Otherwise if you accidentally mount it in MacOS, -MacOS will helpfully ruin it. - -</para> - </sect3> - </sect2> diff --git a/en/install-methods/install-methods.xml b/en/install-methods/install-methods.xml index 3042e1190..5b4710eac 100644 --- a/en/install-methods/install-methods.xml +++ b/en/install-methods/install-methods.xml @@ -6,7 +6,6 @@ &official-cdrom.xml; &downloading-files.xml; -&create-floppy.xml; &boot-usb-files.xml; &boot-drive-files.xml; &install-tftp.xml; diff --git a/en/install-methods/official-cdrom.xml b/en/install-methods/official-cdrom.xml index ec3b76cf8..4d9414823 100644 --- a/en/install-methods/official-cdrom.xml +++ b/en/install-methods/official-cdrom.xml @@ -42,8 +42,6 @@ If your machine doesn't support CD booting<phrase arch="x86"> (only relevant on very old PC systems)</phrase>, but you do have a CD set, you can use an alternative strategy such as -<phrase condition="supports-floppy-boot">floppy disk,</phrase> - <phrase arch="s390">VM reader,</phrase> <phrase condition="bootable-disk">hard disk,</phrase> @@ -71,8 +69,6 @@ installer system files and place them on the <phrase arch="s390">VM minidisk</phrase> -<phrase condition="supports-floppy-boot">floppy disk or</phrase> - <phrase condition="bootable-disk">hard disk or</phrase> <phrase condition="bootable-usb">usb stick or</phrase> diff --git a/en/install-methods/tftp/rarp.xml b/en/install-methods/tftp/rarp.xml index ae539c6f3..289d3a5c0 100644 --- a/en/install-methods/tftp/rarp.xml +++ b/en/install-methods/tftp/rarp.xml @@ -12,7 +12,7 @@ If you don't know this information, you can <phrase arch="sparc"> pick it off the initial OpenPROM boot messages, use the OpenBoot <userinput>.enet-addr</userinput> command, or </phrase> -boot into <quote>Rescue</quote> mode (e.g., from the rescue floppy) and use the +boot into <quote>Rescue</quote> mode and use the command <userinput>ip addr show dev eth0</userinput>. </para><para> diff --git a/en/partitioning/device-names.xml b/en/partitioning/device-names.xml index ba8edfbc7..9c68ff013 100644 --- a/en/partitioning/device-names.xml +++ b/en/partitioning/device-names.xml @@ -14,16 +14,6 @@ and mount partitions. Here's the basic naming scheme: <itemizedlist arch="not-s390"> <listitem><para> -The first floppy drive is named <filename>/dev/fd0</filename>. - -</para></listitem> -<listitem><para> - -The second floppy drive is named <filename>/dev/fd1</filename>. - -</para></listitem> -<listitem><para> - The first hard disk detected is named <filename>/dev/sda</filename>. </para></listitem> diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml index b65f25f14..a0cf8e648 100644 --- a/en/preparing/bios-setup/s390.xml +++ b/en/preparing/bios-setup/s390.xml @@ -8,8 +8,8 @@ In order to install &debian-gnu; on a &arch-title; or zSeries machine you have first boot a kernel into the system. The boot mechanism of this platform is inherently different to other ones, -especially from PC-like systems: there are no floppy devices available -at all. You will notice another big difference while you work with +especially from PC-like systems, and +you will notice a big difference while you work with this platform: most (if not all) of the time you will work remote, with the help of some client session software like telnet, or a browser. This is due to that special system architecture where the diff --git a/en/preparing/bios-setup/sparc.xml b/en/preparing/bios-setup/sparc.xml index 7def315bc..a88c9fe1a 100644 --- a/en/preparing/bios-setup/sparc.xml +++ b/en/preparing/bios-setup/sparc.xml @@ -49,6 +49,7 @@ the <ulink url="&url-openboot;">Sun OpenBoot Reference</ulink>. </para><para> +<!-- Typically, with newer revisions, you can use OpenBoot devices such as <quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>, <quote>disk</quote>, or <quote>disk2</quote>. These have the obvious @@ -75,6 +76,7 @@ whatever your revision, see the <ulink url="&url-openboot;">Sun OpenBoot Reference</ulink>. </para><para> +--> To boot from a specific device, use the command <userinput>boot <replaceable>device</replaceable></userinput>. You can set this diff --git a/en/preparing/nondeb-part/x86.xml b/en/preparing/nondeb-part/x86.xml index 5b831cd5a..b9c4b2ef6 100644 --- a/en/preparing/nondeb-part/x86.xml +++ b/en/preparing/nondeb-part/x86.xml @@ -2,6 +2,7 @@ <!-- $Id$ --> +<!-- <sect2 arch="any-x86"><title>Partitioning From DOS or Windows</title> <para> @@ -118,3 +119,4 @@ the following command from &debian;: </para> </sect3> </sect2> +--> diff --git a/en/using-d-i/loading-firmware.xml b/en/using-d-i/loading-firmware.xml index 4523da5d6..ff75bd668 100644 --- a/en/using-d-i/loading-firmware.xml +++ b/en/using-d-i/loading-firmware.xml @@ -26,7 +26,7 @@ the driver module will be reloaded. Which devices are scanned and which file systems are supported depends on the architecture, the installation method and the stage of the installation. Especially during the early stages of the installation, loading the firmware -is most likely to succeed from a FAT-formatted floppy disk or USB stick. +is most likely to succeed from a FAT-formatted USB stick. <phrase arch="x86">On i386 and amd64 firmware can also be loaded from an MMC or SD card.</phrase> @@ -59,8 +59,8 @@ method to load such firmware is from some removable medium such as a USB stick. Alternatively, unofficial CD builds containing non-free firmware can be found at <ulink url="&url-firmware-cds;"/>. -To prepare a USB stick (or other medium like a hard drive partition, or floppy -disk), the firmware files or packages must be placed in either the root directory +To prepare a USB stick (or other medium like a hard drive partition), +the firmware files or packages must be placed in either the root directory or a directory named <filename>/firmware</filename> of the file system on the medium. The recommended file system to use is FAT as that is most certain to be supported during the early stages of the installation. diff --git a/en/using-d-i/modules/finish-install.xml b/en/using-d-i/modules/finish-install.xml index 64d330960..f53493c46 100644 --- a/en/using-d-i/modules/finish-install.xml +++ b/en/using-d-i/modules/finish-install.xml @@ -6,7 +6,7 @@ <para arch="not-s390"> -You will be prompted to remove the boot media (CD, floppy, etc) that you +You will be prompted to remove the boot media (CD, USB stick, etc) that you used to boot the installer. After that the system will be rebooted into your new &debian; system. diff --git a/en/using-d-i/modules/save-logs.xml b/en/using-d-i/modules/save-logs.xml index 6cf9b0e3c..7f597fe21 100644 --- a/en/using-d-i/modules/save-logs.xml +++ b/en/using-d-i/modules/save-logs.xml @@ -14,7 +14,7 @@ the installation process will be automatically saved to </para><para> Choosing <guimenuitem>Save debug logs</guimenuitem> from the main -menu allows you to save the log files to a floppy disk, network, hard +menu allows you to save the log files to a USB stick, network, hard disk, or other media. This can be useful if you encounter fatal problems during the installation and wish to study the logs on another system or attach them to an installation report. diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml index ca1872784..f0389d81e 100644 --- a/en/using-d-i/using-d-i.xml +++ b/en/using-d-i/using-d-i.xml @@ -407,7 +407,7 @@ which operating system to start. The various bootloader installers each install a boot loader program on the hard disk, which is necessary for the computer to start up using &arch-kernel; -without using a floppy or CD-ROM. Many boot loaders allow the user to +without using a USB stick or CD-ROM. Many boot loaders allow the user to choose an alternate operating system each time the computer boots. </para></listitem> @@ -425,7 +425,7 @@ console. <term>save-logs</term><listitem><para> -Provides a way for the user to record information on a floppy disk, network, +Provides a way for the user to record information on a USB stick, network, hard disk, or other media when trouble is encountered, in order to accurately report installer software problems to &debian; developers later. |