diff options
| -rw-r--r-- | build/entities/urls.ent | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | en/using-d-i/loading-firmware.xml | 11 |
3 files changed, 10 insertions, 4 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent index c73108627..00c48213c 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -81,6 +81,8 @@ <!ENTITY url-firmware-tarballs "http://cdimage.debian.org/cdimage/unofficial/non-free/firmware/"> <!-- rough list of firmware packages --> <!ENTITY url-firmware-packages "http://packages.debian.org/search?keywords=firmware"> +<!-- iso images with firmware included --> +<!ENTITY url-firmware-cds "http://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/"> <!-- WNPP --> <!ENTITY url-wnpp "http://&www-debian-org;/devel/wnpp/"> diff --git a/debian/changelog b/debian/changelog index 967277916..85dffdda1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low [ Joey Hess ] * Remove dead link to Phoenix large disk BIOS faq. Closes: #638268 + * Add a pointer to the unofficial non-free CDs with firmware. -- Samuel Thibault <sthibault@debian.org> Sun, 20 Feb 2011 21:47:31 +0100 diff --git a/en/using-d-i/loading-firmware.xml b/en/using-d-i/loading-firmware.xml index 0686e1455..95a13496e 100644 --- a/en/using-d-i/loading-firmware.xml +++ b/en/using-d-i/loading-firmware.xml @@ -42,10 +42,13 @@ the installation. <sect2><title>Preparing a medium</title> <para> -Although in some cases the firmware can also be loaded from a partition on -a hard disk, the most common method to load firmware will be from some -removable medium such as a floppy disk or a USB stick. -The firmware files or packages must be placed in either the root directory +Official CD images do not include non-free firmware. The most common +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 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. |