diff options
| -rw-r--r-- | nl/appendix/preseed.xml | 57 | ||||
| -rw-r--r-- | nl/boot-installer/accessibility.xml | 12 | ||||
| -rw-r--r-- | nl/boot-installer/arm.xml | 218 | ||||
| -rw-r--r-- | nl/boot-installer/mipsel.xml | 5 | ||||
| -rw-r--r-- | nl/boot-installer/parameters.xml | 16 | ||||
| -rw-r--r-- | nl/boot-installer/x86.xml | 4 | ||||
| -rw-r--r-- | nl/hardware/hardware-supported.xml | 26 | ||||
| -rw-r--r-- | nl/hardware/installation-media.xml | 12 | ||||
| -rw-r--r-- | nl/hardware/supported-peripherals.xml | 10 | ||||
| -rw-r--r-- | nl/hardware/supported/arm.xml | 30 | ||||
| -rw-r--r-- | nl/hardware/supported/mipsel.xml | 8 | ||||
| -rw-r--r-- | nl/install-methods/download/arm.xml | 22 | ||||
| -rw-r--r-- | nl/install-methods/install-tftp.xml | 4 | ||||
| -rw-r--r-- | nl/install-methods/tftp/bootp.xml | 7 |
14 files changed, 242 insertions, 189 deletions
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml index a3b52c8f7..979f7f99a 100644 --- a/nl/appendix/preseed.xml +++ b/nl/appendix/preseed.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 58385 untranslated --> +<!-- original version: 59739 untranslated --> <!-- Be careful with the format of this file as it is parsed to generate @@ -800,6 +800,11 @@ The following debconf variables are relevant for network configuration. </para> <informalexample role="example"><screen> +# Disable network configuration entirely. This is useful for cdrom +# installations on non-networked devices where the network questions, +# warning and long timeouts are a nuisance. +#d-i netcfg/enable boolean false + # netcfg will choose an interface that has link if possible. This makes it # skip displaying a list if there is more than one interface. d-i netcfg/choose_interface select auto @@ -1012,7 +1017,7 @@ d-i partman-auto/choose_recipe select atomic # This makes partman automatically partition without confirmation, provided # that you told it what to do using one of the methods above. -d-i partman/confirm_write_new_label boolean true +d-i partman-partitioning/confirm_write_new_label boolean true d-i partman/choose_partition select finish d-i partman/confirm boolean true </screen></informalexample> @@ -1083,13 +1088,50 @@ Check <filename>/var/log/syslog</filename> if you run into problems. # This makes partman automatically partition without confirmation. d-i partman-md/confirm boolean true -d-i partman/confirm_write_new_label boolean true +d-i partman-partitioning/confirm_write_new_label boolean true d-i partman/choose_partition select finish d-i partman/confirm boolean true </screen></informalexample> </sect2> + <sect2 id="preseed-partman-mount-styles"> + <title>Controlling how partitions are mounted</title> +<para> + +Normally, filesystems are mounted using a universally unique identifier +(UUID) as a key; this allows them to be mounted properly even if their +device name changes. UUIDs are long and difficult to read, so, if you +prefer, the installer can mount filesystems based on the traditional device +names, or based on a label you assign. If you ask the installer to mount by +label, any filesystems without a label will be mounted using a UUID instead. + +</para><para> + +Devices with stable names, such as LVM logical volumes, will continue to use +their traditional names rather than UUIDs. + +</para> + +<warning><para> + +Traditional device names may change based on the order in which the kernel +discovers devices at boot, which may cause the wrong filesystem to be +mounted. Similarly, labels are likely to clash if you plug in a new disk or +a USB drive, and if that happens your system's behaviour when started will +be random. + +</para></warning> + +<informalexample role="example"><screen> +# The default is to mount by UUID, but you can also choose "traditional" to +# use traditional device names, or "label" to try filesystem labels before +# falling back to UUIDs. +#d-i partman/mount_style select uuid +</screen></informalexample> + + </sect2> + <sect2 id="preseed-base-installer"> <title>Base system installation</title> <para> @@ -1289,6 +1331,10 @@ to be used easily on the kernel command line as well. # Individual additional packages to install #d-i pkgsel/include string openssh-server build-essential +# By default, packages that are only Recommended by packages installed using +# pkgsel/include (as opposed to their dependencies) will not be installed. +# Uncomment this line to install Recommends as well. +#d-i pkgsel/include/install-recommends boolean true # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade #d-i pkgsel/upgrade select none @@ -1334,6 +1380,11 @@ d-i grub-installer/with_other_os boolean true #d-i grub-installer/password-again password r00tme # or encrypted using an MD5 hash, see grub-md5-crypt(8). #d-i grub-installer/password-crypted password [MD5 hash] + +# Use the following option to add additional boot parameters for the +# installed system (if supported by the bootloader installer). +# Note: options passed to the installer will be added automatically. +#d-i debian-installer/add-kernel-opts string nousb </screen></informalexample> <para> diff --git a/nl/boot-installer/accessibility.xml b/nl/boot-installer/accessibility.xml index 34cac97a1..7e8c4f46f 100644 --- a/nl/boot-installer/accessibility.xml +++ b/nl/boot-installer/accessibility.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 58190 untranslated --> +<!-- original version: 59051 untranslated --> <sect1 id="boot-installer-accessibility" arch="not-s390"> <title>Accessibility</title> @@ -28,7 +28,9 @@ of the installer will then be automatically selected, and support for the braille display will be automatically installed on the target system. You can thus just press &enterkey; at the boot menu. Once <classname>brltty</classname> is started, you can choose a braille -table by entering the preference menu. +table by entering the preference menu. Documentation on key +bindings for braille devices is available on the <ulink +url="&url-brltty-driver-help;"><classname>brltty</classname> website</ulink>. </para> </sect2> @@ -49,7 +51,9 @@ serial port the display is connected to, <userinput>ttyS0</userinput> is the default. <replaceable>table</replaceable> is the name of the braille table to be used (see the <ulink url="&url-brltty-table-codes;">table code list</ulink>); the English table is the default. Note that the table can -be changed later by entering the preference menu. +be changed later by entering the preference menu. Documentation on key +bindings for braille devices is available on the <ulink +url="&url-brltty-driver-help;"><classname>brltty</classname> website</ulink>. </para> </sect2> @@ -62,6 +66,8 @@ Support for hardware speech synthesis devices is available only alongside support for graphical installer. You thus need to select the <quote>Graphical install</quote> entry in the boot menu. +</para><para> + Hardware speech synthesis devices cannot be automatically detected. You thus need to append the <userinput>speakup.synth=<replaceable>driver</replaceable></userinput> diff --git a/nl/boot-installer/arm.xml b/nl/boot-installer/arm.xml index 5e17ac9ac..81de776e2 100644 --- a/nl/boot-installer/arm.xml +++ b/nl/boot-installer/arm.xml @@ -1,108 +1,10 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 36639 untranslated --> +<!-- original version: 59771 untranslated --> <sect2 arch="arm" id="boot-tftp"><title>Booting from TFTP</title> &boot-installer-intro-net.xml; - <sect3 arch="arm"><title>Booting from TFTP on Netwinder</title> -<para> - -Netwinders have two network interfaces: A 10Mbps NE2000-compatible -card (which is generally referred to as <literal>eth0</literal>) and -a 100Mbps Tulip card. There may be problems loading the image via TFTP -using the 100Mbps card so it is recommended that you use the 10Mbps -interface (the one labeled with <literal>10 Base-T</literal>). - -</para> -<note><para> - -You need NeTTrom 2.2.1 or later to boot the installation system, and -version 2.3.3 is recommended. Unfortunately, firmware files are currently -not available for download because of license issues. If this situation -changes, you may find new images at <ulink url="http//www.netwinder.org/"></ulink>. - -</para></note> -<para> - -When you boot your Netwinder you have to interrupt the boot process during the -countdown. This allows you to set a number of firmware settings needed in -order to boot the installer. First of all, start by loading the default -settings: - -<informalexample><screen> - NeTTrom command-> load-defaults -</screen></informalexample> - -Furthermore, you must configure the network, either with a static address: - -<informalexample><screen> - NeTTrom command-> setenv netconfig_eth0 flash - NeTTrom command-> setenv eth0_ip 192.168.0.10/24 -</screen></informalexample> - -where 24 is the number of set bits in the netmask, or a dynamic address: - -<informalexample><screen> - NeTTrom command-> setenv netconfig_eth0 dhcp -</screen></informalexample> - -You may also need to configure the <userinput>route1</userinput> -settings if the TFTP server is not on the local subnet. - -Following these settings, you have to specify the TFTP server and the -location of the image. You can then store your settings to flash. - -<informalexample><screen> - NeTTrom command-> setenv kerntftpserver 192.168.0.1 - NeTTrom command-> setenv kerntftpfile boot.img - NeTTrom command-> save-all -</screen></informalexample> - -Now you have to tell the firmware that the TFTP image should be booted: - -<informalexample><screen> - NeTTrom command-> setenv kernconfig tftp - NeTTrom command-> setenv rootdev /dev/ram -</screen></informalexample> - -If you use a serial console to install your Netwinder, you need to add the -following setting: - -<informalexample><screen> - NeTTrom command-> setenv cmdappend root=/dev/ram console=ttyS0,115200 -</screen></informalexample> - -Alternatively, for installations using a keyboard and monitor you have to -set: - -<informalexample><screen> - NeTTrom command-> setenv cmdappend root=/dev/ram -</screen></informalexample> - -You can use the <command>printenv</command> command to review your -environment settings. After you have verified that the settings are -correct, you can load the image: - -<informalexample><screen> - NeTTrom command-> boot -</screen></informalexample> - -In case you run into any problems, a <ulink -url="http://www.netwinder.org/howto/Firmware-HOWTO.html">detailed -HOWTO</ulink> is available. - -</para> - </sect3> - - <sect3 arch="arm"><title>Booting from TFTP on CATS</title> -<para> - -On CATS machines, use <command>boot de0:</command> or similar at the -Cyclone prompt. - -</para> - </sect3> </sect2> @@ -110,12 +12,6 @@ Cyclone prompt. &boot-installer-intro-cd.xml; -<para> - -To boot a CD-ROM from the Cyclone console prompt, use the command -<command>boot cd0:cats.bin</command> - -</para> </sect2> @@ -216,4 +112,116 @@ tool</ulink> for Windows to upgrade the firmware via the network. </para> </sect4> </sect3> + + <sect3 arch="arm" id="boot-firmware-ss4000e"> + <title>Booting the SS4000-E</title> +<para> + +Due to limitations in the SS4000-E firmware, it unfortunately is not +possible to boot the installer without the use of a serial port at +this time. To boot the installer, you will need a serial nullmodem +cable; a computer with a serial port<footnote id="arm-s4ke-port"> + +<para> +A USB serial converter will also work. +</para> + +</footnote>; and a ribbon cable with a male DB9 connector at one end, +and a 10-pin .1" IDC header at the other<footnote id="arm-s4k-rib"> + +<para> +This cable is often found in older desktop machines with builtin 9-pin +serial ports. +</para> + +</footnote>. + +</para><para> + +To boot the SS4000-E, first load the Debian-provided firmware image +(ss4000e.pkg) through the SS4000-E's web interface (go to +<quote>administration</quote>, then to <quote>firmware</quote>, and +upload the image). Next, +use your serial nullmodem cable and the ribbon cable to connect to the +serial port of the SS4000-E, and reboot the machine. You need to use a +serial terminal application to communicate with the machine; a good +option on a Debian GNU/Linux is to use the <command>cu</command> +program, in the package of the same name. Assuming the serial port on +your computer is to be found on <filename>/dev/ttyS0</filename>, use the +following command line: + +</para> + +<informalexample><screen> +cu -lttyS0 -s115200 +</screen></informalexample> + +<para> + +If using Windows, you may want to consider using the program +<classname>hyperterminal</classname>. Use a baud rate of 115200, +8 bits word length, no stop bits, and one parity bit. + +</para><para> + +When the machine boots, you will see the following line of output: + +</para> + +<informalexample><screen> +No network interfaces found + +EM-7210 ver.T04 2005-12-12 (For ver.AA) +== Executing boot script in 1.000 seconds - enter ^C to abort +</screen></informalexample> + +<para> + +At this point, hit Control-C to interrupt the boot +loader<footnote id="arm-s4ke-sec"> + +<para> +Note that you have only one second to do so; if you miss this window, +just powercycle the machine and try again. +</para> + +</footnote>. This will give you the RedBoot prompt. Enter the +following command: + +</para> + +<informalexample><screen> +fconfig boot_script_data +</screen></informalexample> + +<para> + +RedBoot is now waiting for you to enter the boot script. Make sure to +<emphasis>exactly</emphasis> enter the following script: + +</para> + +<informalexample><screen> +fis load ramdisk.gz +fis load zImage +exec -c "console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000" -r 0x01800000 +</screen></informalexample> + +<para> + +Finish the script with an empty line, and enter <quote>y</quote> at the +prompt to update the non-volatile configuration. Finally, use +<quote>reset</quote> to restart the system, and allow it to boot normally. +The installer should now come up as normal. You can either install Debian +through the serial port, or use an SSH client to connect through SSH. + +</para><para> + +Note that it is not necessary to update the boot script after the +installation. The system will be configured to take the root device from +system configuration, rather than from the kernel command line. It will +not do any harm to do so anyway, however. + +</para> + </sect3> </sect2> diff --git a/nl/boot-installer/mipsel.xml b/nl/boot-installer/mipsel.xml index 69245e3fd..4249e5b4c 100644 --- a/nl/boot-installer/mipsel.xml +++ b/nl/boot-installer/mipsel.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 35612 untranslated --> +<!-- original version: 58447 untranslated --> <sect2 arch="mipsel" id="boot-tftp"><title>Booting with TFTP</title> @@ -28,8 +28,7 @@ the installation. Via serial console: Using a null modem cable, you can connect to the serial port of your Cobalt machine (using 115200 bps) and perform the installation -this way. This option is not available on Qube 2700 (Qube1) machines since -they have no serial port. +this way. </para></listitem> </itemizedlist> diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml index 0f9543b58..9aeaff7a9 100644 --- a/nl/boot-installer/parameters.xml +++ b/nl/boot-installer/parameters.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 58385 untranslated --> +<!-- original version: 58405 untranslated --> <sect1 id="boot-parms"><title>Boot Parameters</title> <para> @@ -53,7 +53,19 @@ to pass the <userinput>console=<replaceable>device</replaceable></userinput> argument to the kernel, where <replaceable>device</replaceable> is your serial device, which is usually something like -<filename>ttyS0</filename>. +<filename>ttyS0</filename><footnote> + +<para> +In order to ensure the terminal type used by the installer matches your +terminal emulator, the parameter +<userinput>TERM=<replaceable>type</replaceable></userinput> can be added. +Note that the installer only supports the following terminal types: +<literal>linux</literal>, <literal>bterm</literal>, <literal>ansi</literal>, +<literal>vt102</literal> and <literal>dumb</literal>. The default for +serial console in &d-i; is <userinput>vt102</userinput>. +</para> + +</footnote>. </para><para arch="sparc"> diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml index 5bcd4203a..f6f04e18a 100644 --- a/nl/boot-installer/x86.xml +++ b/nl/boot-installer/x86.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 58178 untranslated --> +<!-- original version: 58402 untranslated --> <sect2 arch="x86"><title>Booting from a CD-ROM</title> @@ -154,7 +154,7 @@ drive unchanged during the install, you can download the <filename>hd-media/initrd.gz</filename> file and its kernel, as well as copy a CD (or DVD) iso to the drive (make sure the file is named ending in <literal>.iso</literal>). The installer can then boot from the drive -and install from the CD image, without needing the network. +and install from the CD/DVD image, without needing the network. </para> <para> diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml index 75eb1ab8d..7d6320bb3 100644 --- a/nl/hardware/hardware-supported.xml +++ b/nl/hardware/hardware-supported.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 58161 untranslated --> +<!-- original version: 58446 untranslated --> <sect1 id="hardware-supported"> <title>Supported Hardware</title> @@ -64,23 +64,21 @@ variations of each architecture known as <quote>flavors</quote>. <row> <entry morerows="4">ARM</entry> - <entry>arm</entry> - <entry>Netwinder and CATS</entry> - <entry>netwinder</entry> -</row><row> - <entry>armel</entry> - <entry>Versatile</entry> - <entry>versatile</entry> -</row><row> - <entry morerows="2">arm and armel</entry> + <entry morerows="4">armel</entry> <entry>Intel IOP32x</entry> <entry>iop32x</entry> </row><row> <entry>Intel IXP4xx</entry> <entry>ixp4xx</entry> </row><row> + <entry>Marvell Kirkwood</entry> + <entry>kirkwood</entry> +</row><row> <entry>Marvell Orion</entry> <entry>orion5x</entry> +</row><row> + <entry>Versatile</entry> + <entry>versatile</entry> </row> <row> @@ -358,13 +356,9 @@ with X.Org version &x11ver;. </para><para arch="mips"> <!-- FIXME: mention explicit graphics chips and not system names --> -The X.Org X Window System is only supported on the SGI Indy and the O2. The -Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI -slots and support VGA emulation or Linux framebuffer on a selected range -of graphics cards. A <ulink url="&url-bcm91250a-hardware;">compatibility -listing</ulink> for Broadcom evaluation boards is available. +The X.Org X Window System is only supported on the SGI Indy and the O2. -</para><para arch="mipsel"> +</para><para arch="mips;mipsel"> The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI slots and support VGA emulation or Linux framebuffer on a selected range diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml index 2f63ce3e7..550c26263 100644 --- a/nl/hardware/installation-media.xml +++ b/nl/hardware/installation-media.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 56150 untranslated --> +<!-- original version: 58446 untranslated --> <sect1 id="installation-media"> <title>Installation Media</title> @@ -83,7 +83,11 @@ capability. If your CD-ROM drive has a jumper labeled <quote>Unix/PC</quote> or <quote>512/2048</quote>, place it in the <quote>Unix</quote> or <quote>512</quote> position. To start the install, simply choose the <quote>System installation</quote> -entry in the firmware. The Broadcom BCM91250A supports standard IDE devices, +entry in the firmware. + +</para><para arch="mips;mipsel"> + +The Broadcom BCM91250A supports standard IDE devices, including CD-ROM drives, but CD images for this platform are currently not provided because the firmware doesn't recognize CD drives. In order to install Debian on an Broadcom BCM91480B evaluation board, you need an PCI @@ -142,7 +146,7 @@ configure your system to use ISDN and PPP. </para><para condition="supports-tftp"> You can also <emphasis>boot</emphasis> the installation system over the -network. <phrase arch="mips">This is the preferred installation technique +network. <phrase arch="mips;mipsel">This is the preferred installation technique for &arch-title;.</phrase> </para><para condition="supports-nfsroot"> @@ -258,7 +262,7 @@ 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. -</para><para arch="mips"> +</para><para arch="mips;mipsel"> Any storage system supported by the Linux kernel is also supported by the boot system. diff --git a/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml index 7a752fbe2..f861784c8 100644 --- a/nl/hardware/supported-peripherals.xml +++ b/nl/hardware/supported-peripherals.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 56244 untranslated --> +<!-- original version: 58446 untranslated --> <sect2 id="supported-peripherals"> <title>Peripherals and Other Hardware</title> @@ -27,7 +27,7 @@ Package installations from XPRAM and tape are not supported by this system. All packages that you want to install need to be available on a DASD or over the network using NFS, HTTP or FTP. -</para><para arch="mips"> +</para><para arch="mips;mipsel"> The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 bit PCI slots as well as USB connectors. The Broadcom BCM91480B evaluation @@ -35,10 +35,8 @@ board features four 64 bit PCI slots. </para><para arch="mipsel"> -The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 -bit PCI slots as well as USB connectors. The Broadcom BCM91480B evaluation -board features four 64 bit PCI slots. The Cobalt RaQ has no support for -additional devices but the Qube has one PCI slot. +The Cobalt RaQ has no support for additional devices but the Qube has one +PCI slot. </para> </sect2> diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml index baf1f5302..1b7a2d810 100644 --- a/nl/hardware/supported/arm.xml +++ b/nl/hardware/supported/arm.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 55470 untranslated --> +<!-- original version: 58440 untranslated --> <sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title> @@ -28,20 +28,6 @@ The supported platforms are: <variablelist> <varlistentry> -<term>Netwinder</term> -<listitem><para> - -This is actually the name for the group of machines -based upon the StrongARM 110 CPU and Intel 21285 Northbridge (also known -as Footbridge). It -comprises of machines like: Netwinder (possibly one of the most common ARM -boxes), CATS (also known as the EB110ATX), EBSA 285 and Compaq -personal server (cps, aka skiff). - -</para></listitem> -</varlistentry> - -<varlistentry> <term>IOP32x</term> <listitem><para> @@ -71,6 +57,20 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>. </varlistentry> <varlistentry> +<term>Kirkwood</term> +<listitem><para> + +Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM +CPU, Ethernet, SATA, USB, and other functionality in one chip. We +currently support the following Kirkwood based devices: <ulink +url="&url-arm-cyrius-sheevaplug;">SheevaPlug</ulink> and <ulink +url="&url-arm-cyrius-qnap-kirkwood;">QNAP Turbo Station</ulink> (TS-119 and +TS-219). + +</para></listitem> +</varlistentry> + +<varlistentry> <term>Orion5x</term> <listitem><para> diff --git a/nl/hardware/supported/mipsel.xml b/nl/hardware/supported/mipsel.xml index bd294ae55..fbce8abff 100644 --- a/nl/hardware/supported/mipsel.xml +++ b/nl/hardware/supported/mipsel.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 55471 untranslated --> +<!-- original version: 58447 untranslated --> <sect2 arch="mipsel"><title>CPU, Main Boards, and Video Support</title> @@ -11,8 +11,7 @@ Debian on &arch-title; supports the following platforms: <listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are covered here. This -includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and RaQ2, and the Gateway -Microserver. +includes the Cobalt RaQ, Qube2 and RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> @@ -48,7 +47,8 @@ debian-&arch-listname; mailing list</ulink>. <para> -All MIPS based Cobalt machines are supported. +All MIPS based Cobalt machines are supported with the exception of the +Qube 2700 (Qube 1). </para><para> diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml index 4c7355ee3..948c05da7 100644 --- a/nl/install-methods/download/arm.xml +++ b/nl/install-methods/download/arm.xml @@ -1,27 +1,7 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 55541 untranslated --> +<!-- original version: 58440 untranslated --> - <sect3 arch="arm" id="netwinder-install-files"> - <title>Netwinder Installation Files</title> -<para> - -The easiest way to boot a Netwinder is over the network, using the -supplied TFTP image &netwinder-boot-img;. - -</para> - </sect3> - - <sect3 arch="arm" id="cats-install-files"> - <title>CATS Installation Files</title> -<para> - -CATS can be booted either via the network or from CD-ROM. The kernel and -initrd can be obtained from &cats-boot-img;. - -</para> - </sect3> - <sect3 arch="arm" id="nslu2-install-files"> <title>NSLU2 Installation Files</title> <para> diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml index cceb18915..57af26da4 100644 --- a/nl/install-methods/install-tftp.xml +++ b/nl/install-methods/install-tftp.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 56425 untranslated --> +<!-- original version: 58446 untranslated --> <sect1 condition="supports-tftp" id="install-tftp"> <title>Preparing Files for TFTP Net Booting</title> @@ -308,7 +308,7 @@ the <userinput>filename=</userinput> option in </para> </sect3> - <sect3 arch="mips"> + <sect3 arch="mips;mipsel"> <title>Broadcom BCM91250A and BCM91480B TFTP Booting</title> <para> diff --git a/nl/install-methods/tftp/bootp.xml b/nl/install-methods/tftp/bootp.xml index 97ef2f793..913b22f98 100644 --- a/nl/install-methods/tftp/bootp.xml +++ b/nl/install-methods/tftp/bootp.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 43558 untranslated --> +<!-- original version: 59293 untranslated --> <sect2 condition="supports-bootp" id="tftp-bootp"> @@ -61,10 +61,11 @@ By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really easy, because it treats BOOTP clients as a moderately special case of DHCP clients. Some architectures require a complex configuration for booting clients via BOOTP. If yours is one of -those, read the section <xref linkend="dhcpd"/>. In that case, you +those, read the section <xref linkend="dhcpd"/>. Otherwise you will probably be able to get away with simply adding the <userinput>allow bootp</userinput> directive to the configuration -block for the subnet containing the client, and restart +block for the subnet containing the client in +<filename>/etc/dhcp3/dhcpd.conf</filename>, and restart <command>dhcpd</command> with <userinput>/etc/init.d/dhcpd3-server restart</userinput>. |