Changeset 229ed25 for BOOK/boot/common/sysvinit.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

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

BOOK/boot/common/sysvinit.xml

@@ -24 +24 @@
 
     <para os="aa">The following modifications help locate files specific to this
-    perticular build:</para>
+    particular build:</para>
 
 <screen os="ab"><userinput>cp -v src/Makefile{,.orig}
@@ -86 +86 @@
 
 <screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
-<literal>1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
+<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
+2:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
+3:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
+4:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
+5:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
+6:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
 </literal>
 EOF</userinput></screen>
@@ -99 +99 @@
 
 <screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
-<literal>c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
+<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
 </literal>
 EOF</userinput></screen>