Changeset 2b687ad


Ignore:
Timestamp:
Feb 10, 2011, 5:04:43 PM (10 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
8050e8b
Parents:
e59e934 (diff), 6d1db7d (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.
git-author:
Joe Ciccone <jciccone@…> (02/10/2011 04:52:13 PM)
git-committer:
Joe Ciccone <jciccone@…> (02/10/2011 05:04:43 PM)
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/general.ent
BOOK/introduction/common/changelog.xml

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/procps.xml

    re59e934 r2b687ad  
    3131<screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
    3232
     33    <para os="p3">The following patch fixes an issue where some procps utils
     34    print an error on the screen if the monitor isn't running at 60Hz:</para>
     35
     36<screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
     37
    3338    <para os="s1">The following fixes an issue with Make 3.82:</para>
    3439
  • BOOK/general.ent

    re59e934 r2b687ad  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "01"> <!-- Use two digits -->
    4 <!ENTITY month_name "February">
    5 <!ENTITY day "06"> <!-- Use two digits -->
     3<!ENTITY month "02"> <!-- Use two digits -->
     4<!ENTITY month_name "Feburary">
     5<!ENTITY day "10"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77
  • BOOK/introduction/common/changelog.xml

    re59e934 r2b687ad  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>February 10, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Added patch to procps to fix an issue when the
     44          screen refresh rate isn't 60Hz.</para>
     45        </listitem>
     46      </itemizedlist>
     47    </listitem>
    3848
    3949    <listitem>
  • BOOK/materials/common/patches.xml

    re59e934 r2b687ad  
    119119
    120120    <varlistentry>
     121      <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
     122      <listitem>
     123        <para>Download: <ulink
     124        url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
     125        <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
     126      </listitem>
     127    </varlistentry>
     128
     129    <varlistentry>
    121130      <term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
    122131      <listitem>
  • BOOK/patches.ent

    re59e934 r2b687ad  
    5656<!ENTITY procps-ps_cgroup-patch-md5 "3c478ef88fad23353e332b1b850ec630">
    5757<!ENTITY procps-ps_cgroup-patch-size "4 KB">
     58
     59<!ENTITY procps-fix_HZ_errors-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
     60<!ENTITY procps-fix_HZ_errors-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">
     61<!ENTITY procps-fix_HZ_errors-patch-size "4 KB">
    5862
    5963<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
  • BOOK/users_groups.ent

    re59e934 r2b687ad  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!-- User IDs for use throught the book -->
     3<!-- User IDs for use throughout the book -->
    44
    55<!ENTITY uid-root "0">
     
    1515<!ENTITY uid-nobody "65534">
    1616
    17 <!-- Group IDs for use throught the book -->
     17<!-- Group IDs for use throughout the book -->
    1818
    1919<!ENTITY gid-root "0">
Note: See TracChangeset for help on using the changeset viewer.