Changeset 7a352da8


Ignore:
Timestamp:
Sep 5, 2014, 7:37:25 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
5898fbf
Parents:
95835e7 (diff), 234b86a (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 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit

Conflicts:

BOOK/general.ent

Location:
BOOK
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r95835e7 r7a352da8  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "09"> <!-- Use two digits -->
    4 <!ENTITY month_name "September">
    5 <!ENTITY day "04"> <!-- Use two digits -->
     3<!ENTITY month "08"> <!-- Use two digits -->
     4<!ENTITY month_name "August">
     5<!ENTITY day "29"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77

  • BOOK/packages.ent

    r95835e7 r7a352da8  
    124124<!ENTITY eudev-version "1.7">
    125125<!ENTITY eudev-size "1,756 KB">
    126 <!ENTITY eudev-url "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/eudev-&eudev-version;.tar.gz">
     126<!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
    127127<!ENTITY eudev-md5 "80649a0350ff9620fc2da9562d9f2a6a">
    128128<!ENTITY eudev-home "http://www.gentoo.org/proj/en/eudev/">

  • BOOK/partitioning/common/creatingpartition.xml

    r95835e7 r7a352da8  
    3333  partition as swap space. This is used by the kernel to store seldom-used
    3434  data and leave more memory available for active processes. The swap
    35   partition for an CLFS system can be the same as the one used by the host
     35  partition for a CLFS system can be the same as the one used by the host
    3636  system, in which case it is not necessary to create another one.</para>
    3737
    … …  
    4848  <para os="e">Remember the designation of the new partition (e.g.,
    4949  <filename class="devicefile">sda5</filename>). This book will refer to
    50   this as the CLFS partition. Also remember the designation of the swap
     50  this as the CLFS partition. Also, remember the designation of the swap
    5151  partition. These names will be needed later for the
    5252  <filename>/etc/fstab</filename> file.</para>
Note: See TracChangeset for help on using the changeset viewer.