Changeset 03e6a40 for BOOK/boot/common/devices.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 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/boot/common/devices.xml (modified) (2 diffs)

BOOK/boot/common/devices.xml

@@ -18 +18 @@
     <title>Creating Initial Device Nodes</title>
 
-    <note os="a">
-      <para>The commands in the remainder of the book should be run as
-      the <systemitem class="username">root</systemitem> user. Check 
-      that ${CLFS} is set in the 
-      <systemitem class="username">root</systemitem> user&rsquo;s environment
-       before proceeding.</para>
-    </note>
-
     <para os="b">When the kernel boots the system, it requires the presence
     of a few device nodes, in particular the <filename
@@ -36 +28 @@
     the following commands:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
-
-    <para>Before udev starts, a tmpfs filesystem is mounted over
-    <filename class="directory">/dev</filename> and the previous entries are
-    no longer available. The following command creates files that are copied
-    over by the udev bootscript:</para>
-
-<screen><userinput>mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
-mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
+mknod -m 0666 ${CLFS}/dev/null c 1 3</userinput></screen>
 
   </sect2>