Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/common/settingenviron.xml

    r88ef769 r03e6a40  
    1212
    1313  <para>The new instance of the shell that will start when the system is booted is a <emphasis>login</emphasis>
    14   shell, which will read <filename>.bash_profile</filename> file. Create the
    15   <filename>.bash_profile</filename> file now:</para>
     14  shell, which will read the <filename>.bash_profile</filename> file. Create
     15  <filename>.bash_profile</filename> now:</para>
    1616
    1717<screen><userinput>cat &gt; ${CLFS}/root/.bash_profile &lt;&lt; "EOF"
Note: See TracChangeset for help on using the changeset viewer.