diff options
Diffstat (limited to 'en')
| -rw-r--r-- | en/appendix/chroot-install.xml | 24 | ||||
| -rw-r--r-- | en/appendix/files.xml | 39 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 4 | ||||
| -rw-r--r-- | en/boot-new/boot-new.xml | 2 | ||||
| -rw-r--r-- | en/partitioning/device-names.xml | 34 | ||||
| -rw-r--r-- | en/partitioning/schemes.xml | 8 | ||||
| -rw-r--r-- | en/using-d-i/modules/partman.xml | 22 | ||||
| -rw-r--r-- | en/using-d-i/modules/x86/lilo-installer.xml | 2 |
8 files changed, 43 insertions, 92 deletions
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index ff7e895eb..584017d15 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -53,11 +53,11 @@ install desktop environments like GNOME or KDE). </para><para> Next, create file systems on the partitions. For example, to create an -ext3 file system on partition <filename>/dev/hda6</filename> (that's +ext3 file system on partition <filename>/dev/sda6</filename> (that's our example root partition): <informalexample><screen> -# mke2fs -j /dev/<replaceable>hda6</replaceable> +# mke2fs -j /dev/<replaceable>sda6</replaceable> </screen></informalexample> To create an ext2 file system instead, omit <userinput>-j</userinput>. @@ -68,9 +68,9 @@ Initialize and activate swap (substitute the partition number for your intended &debian; swap partition): <informalexample><screen> -# mkswap /dev/<replaceable>hda5</replaceable> +# mkswap /dev/<replaceable>sda5</replaceable> # sync -# swapon /dev/<replaceable>hda5</replaceable> +# swapon /dev/<replaceable>sda5</replaceable> </screen></informalexample> Mount one partition as <filename>/mnt/debinst</filename> (the @@ -80,7 +80,7 @@ referenced later below. <informalexample><screen> # mkdir /mnt/debinst -# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst +# mount /dev/<replaceable>sda6</replaceable> /mnt/debinst </screen></informalexample> </para> @@ -552,17 +552,17 @@ Installing and setting up <classname>grub2</classname> is as easy as: <informalexample><screen> # aptitude install grub-pc -# grub-install /dev/<replaceable>hda</replaceable> +# grub-install /dev/<replaceable>sda</replaceable> # update-grub </screen></informalexample> The second command will install <command>grub2</command> (in this case in -the MBR of <literal>hda</literal>). The last command will create a sane +the MBR of <literal>sda</literal>). The last command will create a sane and working <filename>/boot/grub/grub.cfg</filename>. </para><para> -Note that this assumes that a <filename>/dev/hda</filename> device file has +Note that this assumes that a <filename>/dev/sda</filename> device file has been created. There are alternative methods to install <command>grub2</command>, but those are outside the scope of this appendix. @@ -571,8 +571,8 @@ but those are outside the scope of this appendix. Here is a basic <filename>/etc/lilo.conf</filename> as an example: <informalexample><screen> -boot=/dev/<replaceable>hda6</replaceable> -root=/dev/<replaceable>hda6</replaceable> +boot=/dev/<replaceable>sda6</replaceable> +root=/dev/<replaceable>sda6</replaceable> install=menu delay=20 lba32 @@ -596,10 +596,10 @@ use <filename>yaboot.conf</filename> relative to the system you call it from). Here is a basic <filename>/etc/yaboot.conf</filename> as an example: <informalexample><screen> -boot=/dev/hda2 +boot=/dev/sda2 device=hd: partition=6 -root=/dev/hda6 +root=/dev/sda6 magicboot=/usr/lib/yaboot/ofboot timeout=50 image=/vmlinux diff --git a/en/appendix/files.xml b/en/appendix/files.xml index e389071a7..6b4456971 100644 --- a/en/appendix/files.xml +++ b/en/appendix/files.xml @@ -28,52 +28,27 @@ The most important device files are listed in the tables below. <informaltable><tgroup cols="2"><tbody> <row> - <entry><filename>hda</filename></entry> - <entry>IDE Hard disk / CD-ROM on the first IDE port (Master)</entry> -</row><row> - <entry><filename>hdb</filename></entry> - <entry>IDE Hard disk / CD-ROM on the first IDE port (Slave)</entry> -</row><row> - <entry><filename>hdc</filename></entry> - <entry>IDE Hard disk / CD-ROM on the second IDE port (Master)</entry> -</row><row> - <entry><filename>hdd</filename></entry> - <entry>IDE Hard disk / CD-ROM on the second IDE port (Slave)</entry> -</row><row> - <entry><filename>hda1</filename></entry> - <entry>First partition of the first IDE hard disk</entry> -</row><row> - <entry><filename>hdd15</filename></entry> - <entry>Fifteenth partition of the fourth IDE hard disk</entry> -</row> -</tbody></tgroup></informaltable> - -<informaltable><tgroup cols="2"><tbody> -<row> <entry><filename>sda</filename></entry> - <entry>SCSI Hard disk with lowest SCSI ID (e.g. 0)</entry> + <entry>First hard disk</entry> </row><row> <entry><filename>sdb</filename></entry> - <entry>SCSI Hard disk with next higher SCSI ID (e.g. 1)</entry> -</row><row> - <entry><filename>sdc</filename></entry> - <entry>SCSI Hard disk with next higher SCSI ID (e.g. 2)</entry> + <entry>Second hard disk</entry> </row><row> <entry><filename>sda1</filename></entry> - <entry>First partition of the first SCSI hard disk</entry> + <entry>First partition of the first hard disk</entry> </row><row> - <entry><filename>sdd10</filename></entry> - <entry>Tenth partition of the fourth SCSI hard disk</entry> + <entry><filename>sdb7</filename></entry> + <entry>Seventh partition of the second hard disk</entry> </row> </tbody></tgroup></informaltable> <informaltable><tgroup cols="2"><tbody> <row> <entry><filename>sr0</filename></entry> - <entry>SCSI CD-ROM with the lowest SCSI ID</entry> + <entry>First CD-ROM</entry> </row><row> <entry><filename>sr1</filename></entry> - <entry>SCSI CD-ROM with the next higher SCSI ID</entry> + <entry>Second CD-ROM</entry> </row> </tbody></tgroup></informaltable> diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index d726ecd16..cdfffa05d 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -1130,8 +1130,8 @@ correct one will be selected before using preseeding. # Alternatively, you may specify a disk to partition. If the system has only # one disk the installer will default to using that, but otherwise the device -# name must be given in traditional, non-devfs format (so e.g. /dev/hda or -# /dev/sda, and not e.g. /dev/discs/disc0/disc). +# name must be given in traditional, non-devfs format (so e.g. /dev/sda +# and not e.g. /dev/discs/disc0/disc). # For example, to use the first SCSI/SATA hard disk: #d-i partman-auto/disk string /dev/sda # In addition, you'll need to specify the method to use. diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml index 99443f2b4..5698630b2 100644 --- a/en/boot-new/boot-new.xml +++ b/en/boot-new/boot-new.xml @@ -87,7 +87,7 @@ If you use <command>BootX</command> to boot into the installed system, just select your desired kernel in the <filename>Linux Kernels</filename> folder, un-choose the ramdisk option, and add a root device corresponding to your installation; -e.g. <userinput>/dev/hda8</userinput>. +e.g. <userinput>/dev/sda8</userinput>. </para> </sect2> diff --git a/en/partitioning/device-names.xml b/en/partitioning/device-names.xml index a32102eab..ba8edfbc7 100644 --- a/en/partitioning/device-names.xml +++ b/en/partitioning/device-names.xml @@ -24,14 +24,13 @@ The second floppy drive is named <filename>/dev/fd1</filename>. </para></listitem> <listitem><para> -The first SCSI disk (SCSI ID address-wise) is named -<filename>/dev/sda</filename>. +The first hard disk detected is named <filename>/dev/sda</filename>. </para></listitem> <listitem><para> -The second SCSI disk (address-wise) is named -<filename>/dev/sdb</filename>, and so on. +The second hard disk detected is named <filename>/dev/sdb</filename>, +and so on. </para></listitem> <listitem><para> @@ -40,26 +39,6 @@ The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as <filename>/dev/sr0</filename>. </para></listitem> -<listitem><para> - -The master disk on IDE primary controller is named -<filename>/dev/hda</filename>. - -</para></listitem> -<listitem><para> - -The slave disk on IDE primary controller is named -<filename>/dev/hdb</filename>. - -</para></listitem> -<listitem><para> - -The master and slave disks of the secondary controller can be called -<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, -respectively. Newer IDE controllers can actually have two channels, -effectively acting like two controllers. - -</para></listitem> </itemizedlist> <itemizedlist arch="s390"> @@ -106,12 +85,11 @@ and/or capacities. Linux represents the primary partitions as the drive name, plus the numbers 1 through 4. For example, the first primary partition on the -first IDE drive is <filename>/dev/hda1</filename>. The logical partitions are +first drive is <filename>/dev/sda1</filename>. The logical partitions are numbered starting at 5, so the first logical partition on that same -drive is <filename>/dev/hda5</filename>. Remember that the extended +drive is <filename>/dev/sda5</filename>. Remember that the extended partition, that is, the primary partition holding the logical -partitions, is not usable by itself. This applies to SCSI disks as -well as IDE disks. +partitions, is not usable by itself. </para><para arch="sparc"> diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml index 56ded9fba..4edc34e0d 100644 --- a/en/partitioning/schemes.xml +++ b/en/partitioning/schemes.xml @@ -62,11 +62,11 @@ swap partitions, giving better performance. </para><para> As an example, an older home machine might have 32MB of RAM and a -1.7GB IDE drive on <filename>/dev/hda</filename>. There might be a +1.7GB IDE drive on <filename>/dev/sda</filename>. There might be a 500MB partition for another operating system on -<filename>/dev/hda1</filename>, a 32MB swap partition on -<filename>/dev/hda3</filename> and about 1.2GB on -<filename>/dev/hda2</filename> as the Linux partition. +<filename>/dev/sda1</filename>, a 32MB swap partition on +<filename>/dev/sda3</filename> and about 1.2GB on +<filename>/dev/sda2</filename> as the Linux partition. </para><para> diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml index e821ebc58..937e3b1f0 100644 --- a/en/using-d-i/modules/partman.xml +++ b/en/using-d-i/modules/partman.xml @@ -16,7 +16,7 @@ does not fix this issue. What does help, is to <quote>zero</quote> the first few sectors of the drive: <informalexample><screen> -# dd if=/dev/zero of=/dev/hd<replaceable>X</replaceable> bs=512 count=2; sync +# dd if=/dev/zero of=/dev/sd<replaceable>X</replaceable> bs=512 count=2; sync </screen></informalexample> Note that this will make any existing data on that disk inaccessible. @@ -312,29 +312,27 @@ formatted and where they will be mounted. The list of partitions might look like this: <informalexample><screen> - IDE1 master (hda) - 6.4 GB WDC AC36400L + SCSI1 (0,0,0) (sda) - 6.4 GB WDC AC36400L #1 primary 16.4 MB B f ext2 /boot #2 primary 551.0 MB swap swap #3 primary 5.8 GB ntfs pri/log 8.2 MB FREE SPACE - IDE1 slave (hdb) - 80.0 GB ST380021A + SCSI2 (1,0,0) (sdb) - 80.0 GB ST380021A #1 primary 15.9 MB ext3 #2 primary 996.0 MB fat16 #3 primary 3.9 GB xfs /home - #5 logical 6.0 GB f ext3 / + #5 logical 6.0 GB f ext4 / #6 logical 1.0 GB f ext3 /var #7 logical 498.8 MB ext3 - #8 logical 551.5 MB swap swap - #9 logical 65.8 GB ext2 </screen></informalexample> -This example shows two IDE harddrives divided into several partitions; -the first disk has some free space. Each partition line consists of the -partition number, its type, size, optional flags, file system, and -mountpoint (if any). Note: this particular setup cannot be created using -guided partitioning but it does show possible variation that can be achieved -using manual partitioning. +This example shows two hard drives divided into several partitions; +the first disk has some free space. Each partition line consists of +the partition number, its type, size, optional flags, file system, and +mountpoint (if any). Note: this particular setup cannot be created +using guided partitioning but it does show possible variation that can +be achieved using manual partitioning. </para><para> diff --git a/en/using-d-i/modules/x86/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml index 0295119f2..cc22d1e0f 100644 --- a/en/using-d-i/modules/x86/lilo-installer.xml +++ b/en/using-d-i/modules/x86/lilo-installer.xml @@ -50,7 +50,7 @@ loader. Useful for advanced users who want to install <command>LILO</command> somewhere else. In this case you will be asked for desired location. You can use traditional device names such as -<filename>/dev/hda</filename> or <filename>/dev/sda</filename>. +<filename>/dev/sda</filename>. </para></listitem></varlistentry> </variablelist> |