Changeset 350ab24 for BOOK/boot/common/fstab.xml

Timestamp:

Apr 28, 2014, 8:56:46 PM (11 years ago)

Author:

Chris Staub <chris@…>

Parents:

5c8e74d (diff), 31cfd067 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged latest systemd branch changes

File:

• BOOK/boot/common/fstab.xml (modified) (3 diffs)

BOOK/boot/common/fstab.xml

@@ -13 +13 @@
   <indexterm zone="ch-boot-fstab">
     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
+    <secondary>boot</secondary>
   </indexterm>
 
@@ -28 +29 @@
 /dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
 /dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-proc           /proc        proc   defaults         0     0
-sysfs          /sys         sysfs  defaults         0     0
 devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
 shm            /dev/shm     tmpfs  defaults         0     0
-tmpfs          /run         tmpfs  defaults         0     0
-devtmpfs       /dev         devtmpfs mode=0755,nosuid 0     0
 
 # End /etc/fstab</literal>
@@ -42 +39 @@
   xpointer="xpointer(//*[@os='b'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
+  <para os="c">The <filename class="directory">/dev/shm</filename> mount point
+  for <systemitem class="filesystem">tmpfs</systemitem> is included to
+  allow enabling POSIX-shared memory. The kernel must have the required
+  support built into it for this to work (more about this is in the next
+  section). Please note that very little software currently uses
+  POSIX-shared memory.  Therefore, consider the <filename
+  class="directory">/dev/shm</filename> mount point optional. For more
+  information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
+  in the kernel source tree.</para>
 
 </sect1>