diff options
| author | Joey Hess <joeyh@debian.org> | 2006-10-16 16:51:35 +0000 |
|---|---|---|
| committer | Joey Hess <joeyh@debian.org> | 2006-10-16 16:51:35 +0000 |
| commit | 4446f437beb28ffd4040fb30b2acffd1df51b51f (patch) | |
| tree | e6ea75f5af6c6aeb2c81468b98faad5f3c6e9a73 | |
| parent | 52c9d5be6df6b77bcfaef0955e70bba9492ae19e (diff) | |
| download | installation-guide-4446f437beb28ffd4040fb30b2acffd1df51b51f.zip | |
* Update for recent floppy changes.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | en/boot-installer/x86.xml | 1 | ||||
| -rw-r--r-- | en/howto/installation-howto.xml | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 64d9c4f9a..6aafcdadf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,7 +54,10 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low in preseed text file as it is still somewhat experimental. * Document changes in guided partitioning and added encrypted LVM support. - -- Frans Pop <fjp@debian.org> Thu, 12 Oct 2006 18:46:34 +0200 + [ Joey Hess ] + * Update for recent floppy changes. + + -- Joey Hess <joeyh@debian.org> Mon, 16 Oct 2006 12:47:52 -0400 installation-guide (20060726) unstable; urgency=low diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index fbdb87ba5..c209c0899 100644 --- a/en/boot-installer/x86.xml +++ b/en/boot-installer/x86.xml @@ -230,7 +230,6 @@ 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>linux root=/dev/hdc</userinput> at the boot prompt. -Installation from LS-120 is only supported by 2.4 and later kernels. </para><para> diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index 1b1ab0935..e2e86bacb 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -95,7 +95,7 @@ To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See 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 possibly one of the driver disks. +<filename>floppy/root.img</filename> and one or more of the driver disks. </para><para> @@ -106,8 +106,9 @@ 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.img</filename>, which contains additional -drivers for many ethernet cards, and support for PCMCIA. +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> @@ -215,12 +216,9 @@ Once the installer starts, you will be greeted with an initial screen. Press methods and parameters (see <xref linkend="boot-parms" />). <phrase arch="i386"> If you want a 2.4 kernel, type <userinput>install24</userinput> at the -<prompt>boot:</prompt> prompt. +<prompt>boot:</prompt> prompt. The 2.6 kernel is the default. <footnote><para> -The 2.6 kernel is the default for most boot methods, but is not available -when booting from a floppy. - </para></footnote> </phrase> |