r7408 - in trunk/BOOK: . introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed Apr 30 22:30:42 PDT 2008


Author: dj
Date: 2008-04-30 23:30:42 -0600 (Wed, 30 Apr 2008)
New Revision: 7408

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/xorg7.xml
Log:
Xorg config files fixed for FHS

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2008-04-29 21:28:07 UTC (rev 7407)
+++ trunk/BOOK/general.ent	2008-05-01 05:30:42 UTC (rev 7408)
@@ -3,11 +3,11 @@
 $Date$
 -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
-<!ENTITY month        "04">                   <!-- Always 2 digits -->
+<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "April &day;th, &year;">
+<!ENTITY releasedate  "May &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2008-04-29 21:28:07 UTC (rev 7407)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2008-05-01 05:30:42 UTC (rev 7408)
@@ -42,6 +42,16 @@
 -->
 
     <listitem>
+      <para>May 1st, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Corrected location of Xorg config files for FHS
+          compliance.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 30th, 2008</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2008-04-29 21:28:07 UTC (rev 7407)
+++ trunk/BOOK/x/installing/x-setup.xml	2008-05-01 05:30:42 UTC (rev 7408)
@@ -166,21 +166,6 @@
     <para>For <application>XFree86</application>:</para>
 <screen role="root"><userinput>install -v -m644 -D ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
 
-    <para>As a convenience, Xorg-&xorg7-version; users should populate the
-    <filename class="directory">/etc/X11</filename> directory with symlinks
-    to various configuration directories that were located in
-    <filename class="directory">/etc/X11</filename> with previous
-    versions of <application>Xorg</application>.  This step is not needed
-    for <application>XFree86</application> users.  Execute the following
-    commands as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput role="root">mkdir $XORG_PREFIX/share/X11/twm &&
-ln -svt /etc/X11 \
-    $XORG_PREFIX/lib/X11/{fs,lbxproxy,proxymngr,rstart} \
-    $XORG_PREFIX/lib/X11/{xdm,xinit,xserver,xsm} \
-    $XORG_PREFIX/share/X11/{app-defaults,twm,xkb}</userinput></screen>
-
     <para>As the <systemitem class="username">root</systemitem> user, create
     <filename>.xinitrc</filename>:</para>
 

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2008-04-29 21:28:07 UTC (rev 7407)
+++ trunk/BOOK/x/installing/xorg7.xml	2008-05-01 05:30:42 UTC (rev 7408)
@@ -160,6 +160,28 @@
     <replaceable><PREFIX></replaceable>/share/man</filename> as
     a MANDATORY_MANPATH in <filename>/etc/man_db.conf</filename>.</para>
 
+    <para>Packages in Xorg store their configuration files in
+    <filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
+    This is strictly against FHS guidelines.  To simplify installation,
+    create the proper installation directories in
+    <filename class="directory">/etc/X11</filename> and create symlinks
+    in <filename class="directory">$XORG_PREFIX/lib/X11</filename> to
+    satisfy the installation.  Execute the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>
+install -v -m755 -d \
+    /etc/X11/{app-defaults,fs,twm,xdm,xinit,xkb,xsm} &&
+
+install -v -m755 -d $XORG_PREFIX/lib/X11 &&
+
+for link in \
+    /etc/X11/{app-defaults,fs,twm,xdm,xinit,xkb,xsm}
+do
+    ln -sv $link $XORG_PREFIX/lib/X11
+done
+</userinput></screen>
+
   </sect2>
 
 </sect1>




More information about the blfs-book mailing list