Devices name/node tagging is not consistent in the Handbook, it should

respect the following scheme:
- if the device name is /dev/foo --> <filename>/dev/foo</filename>
- if the device name is just foo --> <devicename>foo</devicename>
(See "4.2.5.7 Devices" from fdp-primer)
This commit is contained in:
Marc Fonvieille 2004-08-11 16:24:26 +00:00
parent 3f6c999916
commit 9565589609
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=21929
9 changed files with 77 additions and 72 deletions

View file

@ -541,7 +541,7 @@ sh MAKEDEV ccd0</programlisting>
<calloutlist>
<callout arearefs="co-ccd-dev">
<para>The first argument is the device to configure, in this case,
<devicename>/dev/ccd0c</devicename>. The <filename>/dev/</filename>
<filename>/dev/ccd0c</filename>. The <filename>/dev/</filename>
portion is optional.</para>
</callout>
@ -1246,13 +1246,13 @@ scsibus1:
everything will work. You do this by specifying the
<option>-t cd9660</option> option &man.mount.8;. For
example, if you want to mount the CDROM device,
<devicename>/dev/cd0</devicename>, under
<filename>/dev/cd0</filename>, under
<filename>/mnt</filename>, you would execute:</para>
<screen>&prompt.root; <userinput>mount -t cd9660 /dev/cd0 /mnt</userinput></screen>
<para>Note that your device name
(<devicename>/dev/cd0</devicename> in this example) could be
(<filename>/dev/cd0</filename> in this example) could be
different, depending on the interface your CDROM uses. Also,
the <option>-t cd9660</option> option just executes
&man.mount.cd9660.8;. The above example could be shortened
@ -3550,8 +3550,8 @@ Password:</screen>
<para>Install the new drive to the system as explained in <xref
linkend="disks-adding">. For the purposes of this example,
a new hard drive partition has been added as
<devicename>/dev/ad4s1c</devicename>. The
<devicename>/dev/ad0s1<replaceable>*</replaceable></devicename>
<filename>/dev/ad4s1c</filename>. The
<filename>/dev/ad0s1<replaceable>*</replaceable></filename>
devices represent existing standard FreeBSD partitions on
the example system.</para>

View file

@ -3735,7 +3735,7 @@ Press enter to continue, or ctrl-c to abort.</screen>
<para>Pressing <keycap>Enter</keycap> will start the mouse
configuration. Be sure to follow the instructions and use
<quote>Mouse Systems</quote> as the mouse protocol and
<devicename>/dev/sysmouse</devicename> as the mouse port even if
<filename>/dev/sysmouse</filename> as the mouse port even if
using a PS/2 mouse is shown as an illustration.</para>
<screen>First specify a mouse protocol type. Choose one from the following list:

View file

@ -1563,9 +1563,9 @@ export PATH</programlisting>
<para>To keep it simple, the same disk layout both for the
<application>&sap.r3; 46B</application> and <application>&sap.r3; 46C
SR2</application> installation was used. Only the device names
changed, as the installations were on different hardware (<devicename>/dev/da</devicename>
and <devicename>/dev/amr</devicename> respectively, so if using an AMI &megaraid;, one will see
<devicename>/dev/amr0s1a</devicename> instead of <devicename>/dev/da0s1a</devicename>):</para>
changed, as the installations were on different hardware (<filename>/dev/da</filename>
and <filename>/dev/amr</filename> respectively, so if using an AMI &megaraid;, one will see
<filename>/dev/amr0s1a</filename> instead of <filename>/dev/da0s1a</filename>):</para>
<informaltable frame="none">
<tgroup cols="4">
@ -1579,49 +1579,49 @@ export PATH</programlisting>
</thead>
<tbody>
<row>
<entry><devicename>/dev/da0s1a</devicename></entry>
<entry><filename>/dev/da0s1a</filename></entry>
<entry>1.016.303</entry>
<entry>1</entry>
<entry><filename>/</filename></entry>
</row>
<row>
<entry><devicename>/dev/da0s1b</devicename></entry>
<entry><filename>/dev/da0s1b</filename></entry>
<entry> </entry>
<entry>6</entry>
<entry>swap</entry>
</row>
<row>
<entry><devicename>/dev/da0s1e</devicename></entry>
<entry><filename>/dev/da0s1e</filename></entry>
<entry>2.032.623</entry>
<entry>2</entry>
<entry><filename>/var</filename></entry>
</row>
<row>
<entry><devicename>/dev/da0s1f</devicename></entry>
<entry><filename>/dev/da0s1f</filename></entry>
<entry>8.205.339</entry>
<entry>8</entry>
<entry><filename>/usr</filename></entry>
</row>
<row>
<entry><devicename>/dev/da1s1e</devicename></entry>
<entry><filename>/dev/da1s1e</filename></entry>
<entry>45.734.361</entry>
<entry>45</entry>
<entry><filename>/compat/linux/oracle</filename></entry>
</row>
<row>
<entry><devicename>/dev/da1s1f</devicename></entry>
<entry><filename>/dev/da1s1f</filename></entry>
<entry>2.032.623</entry>
<entry>2</entry>
<entry><filename>/compat/linux/sapmnt</filename></entry>
</row>
<row>
<entry><devicename>/dev/da1s1g</devicename></entry>
<entry><filename>/dev/da1s1g</filename></entry>
<entry>2.032.623</entry>
<entry>2</entry>
<entry><filename>/compat/linux/usr/sap</filename></entry>

View file

@ -352,7 +352,7 @@ pcm0: &lt;SB16 DSP 4.11&gt; on sbc0</screen>
<note>
<para>The above commands will <emphasis>not</emphasis> create a
<devicename>/dev/snd</devicename> device!</para>
<filename>/dev/snd</filename> device!</para>
</note>
<para><command>MAKEDEV</command> will create a group of device
@ -369,43 +369,43 @@ pcm0: &lt;SB16 DSP 4.11&gt; on sbc0</screen>
<tbody>
<row>
<entry><devicename>/dev/audio</devicename></entry>
<entry><filename>/dev/audio</filename></entry>
<entry>&sparc; compatible audio device</entry>
</row>
<row>
<entry><devicename>/dev/dsp</devicename></entry>
<entry><filename>/dev/dsp</filename></entry>
<entry>Digitized voice device</entry>
</row>
<row>
<entry><devicename>/dev/dspW</devicename></entry>
<entry>Like <devicename>/dev/dsp</devicename>, but 16 bits
<entry><filename>/dev/dspW</filename></entry>
<entry>Like <filename>/dev/dsp</filename>, but 16 bits
per sample</entry>
</row>
<row>
<entry><devicename>/dev/midi</devicename></entry>
<entry><filename>/dev/midi</filename></entry>
<entry>Raw midi access device</entry>
</row>
<row>
<entry><devicename>/dev/mixer</devicename></entry>
<entry><filename>/dev/mixer</filename></entry>
<entry>Control port mixer device</entry>
</row>
<row>
<entry><devicename>/dev/music</devicename></entry>
<entry><filename>/dev/music</filename></entry>
<entry>Level 2 sequencer interface</entry>
</row>
<row>
<entry><devicename>/dev/sequencer</devicename></entry>
<entry><filename>/dev/sequencer</filename></entry>
<entry>Sequencer device</entry>
</row>
<row>
<entry><devicename>/dev/pss</devicename></entry>
<entry><filename>/dev/pss</filename></entry>
<entry>Programmable device interface</entry>
</row>
</tbody>
@ -521,7 +521,7 @@ pcm0: &lt;SB16 DSP 4.11&gt; on sbc0</screen>
given.</para>
<para>If you are not using &man.devfs.5;, you will have to point
your applications at <devicename>/dev/dsp0</devicename>.<replaceable>x</replaceable>, where
your applications at <filename>/dev/dsp0</filename>.<replaceable>x</replaceable>, where
<replaceable>x</replaceable> is 0 to 3 if <varname>hw.snd.pcm.0.vchans</varname> is set
to 4 as in the above example. On a system using &man.devfs.5;, the above will automatically be
allocated transparently to the user.</para>
@ -1718,7 +1718,7 @@ device uscanner</programlisting>
<screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen>
<para>This shows that our scanner is using the
<devicename>/dev/uscanner0</devicename> device node.</para>
<filename>/dev/uscanner0</filename> device node.</para>
<note>
<para>On &os;&nbsp;4.X, the USB daemon (&man.usbd.8;) must
@ -1847,7 +1847,7 @@ device `snapscan:/dev/pass3' is a AGFA SNAPSCAN 600 flatbed scanner</screen>
found USB scanner (UNKNOWN vendor and product) at device /dev/uscanner0</screen>
<para>The scanner is correctly detected, it uses the USB
interface and is attached to the
<devicename>/dev/uscanner0</devicename> device node. We can now
<filename>/dev/uscanner0</filename> device node. We can now
check if the scanner is correctly identified:</para>
<screen>&prompt.root; <userinput>scanimage -L</userinput>
@ -1916,7 +1916,7 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen>
to the scanner. The user will need read and write
permissions to the device node used by the scanner. As an
example, our USB scanner uses the device node
<devicename>/dev/uscanner0</devicename> which is owned by the
<filename>/dev/uscanner0</filename> which is owned by the
<groupname>operator</groupname> group. Adding the user
<username>joe</username> to the
<groupname>operator</groupname> group will allow him to use

View file

@ -3793,7 +3793,7 @@ $TTL 6h
</listitem>
<listitem>
<para>Make a <devicename>dev/null</devicename> that
<para>Make a <filename>dev/null</filename> that
<application>named</application> can see and write to:</para>
<screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>

View file

@ -252,7 +252,7 @@
<para>Under normal circumstances, most users will only need
one <devicename>tun</devicename> device
(<devicename>/dev/tun0</devicename>). References to
(<filename>/dev/tun0</filename>). References to
<devicename>tun0</devicename> below may be changed to
<devicename>tun<replaceable>N</replaceable></devicename>
where <replaceable>N</replaceable> is any unit number
@ -373,9 +373,9 @@
<listitem>
<para>Identifies the device to which the modem is
connected. <devicename>COM1</devicename> is
<devicename>/dev/cuaa0</devicename> and
<filename>/dev/cuaa0</filename> and
<devicename>COM2</devicename> is
<devicename>/dev/cuaa1</devicename>.</para>
<filename>/dev/cuaa1</filename>.</para>
</listitem>
</varlistentry>
@ -1800,7 +1800,7 @@ exit 1
<para>which will create the serial devices for your system.
When matching up sio modem is on <devicename>sio1</devicename> or
<devicename>COM2</devicename> if you are in DOS, then your
modem device would be <devicename>/dev/cuaa1</devicename>.</para>
modem device would be <filename>/dev/cuaa1</filename>.</para>
</sect2>
<sect2>
@ -1821,7 +1821,7 @@ exit 1
<para>We have now started <command>ppp</command>.</para>
<screen>ppp ON example&gt; <userinput>set device <devicename>/dev/cuaa1</devicename></userinput></screen>
<screen>ppp ON example&gt; <userinput>set device <filename>/dev/cuaa1</filename></userinput></screen>
<para>We set our modem device, in this case it is
<devicename>cuaa1</devicename>.</para>
@ -1843,7 +1843,7 @@ exit 1
<para>Switch to <quote>terminal</quote> mode so that we can manually
control the modem.</para>
<programlisting>deflink: Entering terminal mode on <devicename>/dev/cuaa1</devicename>
<programlisting>deflink: Entering terminal mode on <filename>/dev/cuaa1</filename>
type '~h' for help</programlisting>
<screen><userinput>at</userinput>
@ -2455,8 +2455,8 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
<para>First, determine which serial port your modem is connected to.
Many people set up a symbolic link, such as
<devicename>/dev/modem</devicename>, to point to the real device name,
<devicename>/dev/cuaaN</devicename>. This allows you to
<filename>/dev/modem</filename>, to point to the real device name,
<filename>/dev/cuaaN</filename>. This allows you to
abstract the actual device name should you ever need to move
the modem to a different port. It can become quite cumbersome when you
need to fix a bunch of files in <filename>/etc</filename> and
@ -2473,6 +2473,11 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
<programlisting>pseudo-device sl 1</programlisting>
<para>Under &os;&nbsp;5.X, use instead the folowing
line:</para>
<programlisting>device sl</programlisting>
<para>It is included in the <filename>GENERIC</filename> kernel, so
this should not be a problem unless you have deleted it.</para>

View file

@ -603,8 +603,8 @@
</indexterm>
<para>But even if you turn off the <devicename>bpf</devicename>
device, you still have
<devicename>/dev/mem</devicename> and
<devicename>/dev/kmem</devicename>
<filename>/dev/mem</filename> and
<filename>/dev/kmem</filename>
to worry about. For that matter, the intruder can still write to
raw disk devices. Also, there is another kernel feature called
the module loader, &man.kldload.8;. An enterprising intruder can

View file

@ -420,14 +420,14 @@ device sio3 at isa? port IO_COM4 irq 9</programlisting>
use <command>MAKEDEV ttyd1</command>.</para>
<para><command>MAKEDEV</command> not only creates the
<devicename>/dev/ttyd<replaceable>N</replaceable></devicename> device
<filename>/dev/ttyd<replaceable>N</replaceable></filename> device
special files, but also the
<devicename>/dev/cuaa<replaceable>N</replaceable></devicename>,
<devicename>/dev/cuaia<replaceable>N</replaceable></devicename>,
<devicename>/dev/cuala<replaceable>N</replaceable></devicename>,
<devicename>/dev/ttyld<replaceable>N</replaceable></devicename>,
<filename>/dev/cuaa<replaceable>N</replaceable></filename>,
<filename>/dev/cuaia<replaceable>N</replaceable></filename>,
<filename>/dev/cuala<replaceable>N</replaceable></filename>,
<filename>/dev/ttyld<replaceable>N</replaceable></filename>,
and
<devicename>/dev/ttyid<replaceable>N</replaceable></devicename>
<filename>/dev/ttyid<replaceable>N</replaceable></filename>
nodes.</para>
<para>After making new device special files, be sure to check the
@ -690,7 +690,7 @@ crw-rw---- 1 uucp dialer 28, 193 Feb 15 14:38 /dev/cuala1</screen>
and pseudo-ttys. For a hardwired terminal, just list the serial
port's <filename>/dev</filename> entry without the
<filename>/dev</filename> part (for example,
<devicename>/dev/ttyv0</devicename> would be listed as
<filename>/dev/ttyv0</filename> would be listed as
<devicename>ttyv0</devicename>).</para>
<para>A default FreeBSD install includes an

View file

@ -750,8 +750,8 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<itemizedlist>
<listitem>
<para>The control devices
<devicename>/dev/vinum/control</devicename> and
<devicename>/dev/vinum/controld</devicename>, which are used
<filename>/dev/vinum/control</filename> and
<filename>/dev/vinum/controld</filename>, which are used
by &man.vinum.8; and the Vinum daemon respectively.</para>
</listitem>
@ -762,21 +762,21 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
names follow the BSD tradition of prepending the letter
<emphasis>r</emphasis> to the name. Thus the configuration
above would include the block devices
<devicename>/dev/vinum/myvol</devicename>,
<devicename>/dev/vinum/mirror</devicename>,
<devicename>/dev/vinum/striped</devicename>,
<devicename>/dev/vinum/raid5</devicename> and
<devicename>/dev/vinum/raid10</devicename>, and the
<filename>/dev/vinum/myvol</filename>,
<filename>/dev/vinum/mirror</filename>,
<filename>/dev/vinum/striped</filename>,
<filename>/dev/vinum/raid5</filename> and
<filename>/dev/vinum/raid10</filename>, and the
character devices
<devicename>/dev/vinum/rmyvol</devicename>,
<devicename>/dev/vinum/rmirror</devicename>,
<devicename>/dev/vinum/rstriped</devicename>,
<devicename>/dev/vinum/rraid5</devicename> and
<devicename>/dev/vinum/rraid10</devicename>. There is
<filename>/dev/vinum/rmyvol</filename>,
<filename>/dev/vinum/rmirror</filename>,
<filename>/dev/vinum/rstriped</filename>,
<filename>/dev/vinum/rraid5</filename> and
<filename>/dev/vinum/rraid10</filename>. There is
obviously a problem here: it is possible to have two volumes
called <emphasis>r</emphasis> and <emphasis>rr</emphasis>,
but there will be a conflict creating the device node
<devicename>/dev/vinum/rr</devicename>: is it a character
<filename>/dev/vinum/rr</filename>: is it a character
device for volume <emphasis>r</emphasis> or a block device
for volume <emphasis>rr</emphasis>? Currently Vinum does
not address this conflict: the first-defined volume will get
@ -784,7 +784,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
</listitem>
<listitem>
<para>A directory <devicename>/dev/vinum/drive</devicename>
<para>A directory <filename>/dev/vinum/drive</filename>
with entries for each drive. These entries are in fact
symbolic links to the corresponding disk nodes.</para>
</listitem>
@ -798,9 +798,9 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<listitem>
<para>The directories
<devicename>/dev/vinum/plex</devicename>,
<devicename>/dev/vinum/sd</devicename>, and
<devicename>/dev/vinum/rsd</devicename>, which contain block
<filename>/dev/vinum/plex</filename>,
<filename>/dev/vinum/sd</filename>, and
<filename>/dev/vinum/rsd</filename>, which contain block
device nodes for each plex and block and character device
nodes respectively for each subdisk.</para>
</listitem>
@ -897,14 +897,14 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
utilities, notably &man.newfs.8;, which previously tried to
interpret the last letter of a Vinum volume name as a
partition identifier. For example, a disk drive may have a
name like <devicename>/dev/ad0a</devicename> or
<devicename>/dev/da2h</devicename>. These names represent
name like <filename>/dev/ad0a</filename> or
<filename>/dev/da2h</filename>. These names represent
the first partition (<devicename>a</devicename>) on the
first (0) IDE disk (<devicename>ad</devicename>) and the
eighth partition (<devicename>h</devicename>) on the third
(2) SCSI disk (<devicename>da</devicename>) respectively.
By contrast, a Vinum volume might be called
<devicename>/dev/vinum/concat</devicename>, a name which has
<filename>/dev/vinum/concat</filename>, a name which has
no relationship with a partition name.</para>
<para>Normally, &man.newfs.8; interprets the name of the disk and
@ -1404,7 +1404,7 @@ Subdisk root.p1.s0:
make Vinum automatically scan all disks are missing, and the
code that figures out the internal ID of the root device is
not smart enough to handle a name like
<devicename>/dev/vinum/root</devicename> automatically.
<filename>/dev/vinum/root</filename> automatically.
Therefore, things are a little different here.</para>
<para>Vinum must explicitly be told which disks to scan, using a
@ -1424,9 +1424,9 @@ Subdisk root.p1.s0:
<para>Since the routines used to parse the name of the root
filesystem, and derive the device ID (major/minor number) are
only prepared to handle <quote>classical</quote> device names
like <devicename>/dev/ad0s1a</devicename>, they cannot make
like <filename>/dev/ad0s1a</filename>, they cannot make
any sense out of a root volume name like
<devicename>/dev/vinum/root</devicename>. For that reason,
<filename>/dev/vinum/root</filename>. For that reason,
Vinum itself needs to pre-setup the internal kernel parameter
that holds the ID of the root device during its own
initialization. This is requested by passing the name of the
@ -1464,7 +1464,7 @@ Subdisk root.p1.s0:
again, since it cannot be parsed. The only way out is to
reboot again, and start over then. (At the
<quote>askroot</quote> prompt, the initial
<devicename>/dev/</devicename> can always be omitted.)</para>
<filename>/dev/</filename> can always be omitted.)</para>
</sect2>
</sect1>
</chapter>