Changeset 03e6a40 for BOOK/bootable/common/fstab.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/bootable/common/fstab.xml (modified) (1 diff)

BOOK/bootable/common/fstab.xml

@@ -28 +28 @@
 /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>