r5646 - in trunk: BOOK BOOK/gnome/add BOOK/introduction/welcome bootscripts bootscripts/blfs/init.d

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Feb 5 09:38:41 PST 2006


Author: randy
Date: 2006-02-05 10:38:39 -0700 (Sun, 05 Feb 2006)
New Revision: 5646

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/add/gdm.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/bootscripts/ChangeLog
   trunk/bootscripts/blfs/init.d/gdm
Log:
Updated GDM to fit the GNOME-2.12.2 version

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-02-04 22:05:04 UTC (rev 5645)
+++ trunk/BOOK/general.ent	2006-02-05 17:38:39 UTC (rev 5646)
@@ -1,4 +1,4 @@
-<!ENTITY day          "04">                   <!-- Always 2 digits -->
+<!ENTITY day          "05">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -24,7 +24,7 @@
 <!ENTITY publisher      "Unknown">
 
 
-<!ENTITY blfs-bootscripts-version     "20060101">
+<!ENTITY blfs-bootscripts-version     "20060205">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
 <!ENTITY blfs-wiki                    "http://wiki.linuxfromscratch.org/blfs/wiki">

Modified: trunk/BOOK/gnome/add/gdm.xml
===================================================================
--- trunk/BOOK/gnome/add/gdm.xml	2006-02-04 22:05:04 UTC (rev 5645)
+++ trunk/BOOK/gnome/add/gdm.xml	2006-02-05 17:38:39 UTC (rev 5646)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gdm-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/gdm-&gdm-version;.tar.bz2">
-  <!ENTITY gdm-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/gdm-&gdm-version;.tar.bz2">
-  <!ENTITY gdm-md5sum        "2944ba9c2a2bf7032ac81dc24eecf32d">
+  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/2.8/gdm-&gdm-version;.tar.bz2">
+  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/2.8/gdm-&gdm-version;.tar.bz2">
+  <!ENTITY gdm-md5sum        "566a1e3d656b6b536414f287ead2db7e">
   <!ENTITY gdm-size          "2.7 MB">
-  <!ENTITY gdm-buildsize     "51.7 MB">
+  <!ENTITY gdm-buildsize     "51.2 MB">
   <!ENTITY gdm-time          "0.7 SBU">
 ]>
 
@@ -63,7 +63,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeui"/>,
-    <xref linkend="scrollkeeper"/> and
+    <xref linkend="scrollkeeper"/>, and
     <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -88,20 +88,18 @@
     the following commands as an unprivileged user:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib \
-    --with-pam-prefix=/etc &&
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/gdm \
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib \
+            --with-pam-prefix=/etc &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>make install &&
-chmod -v 644 `pkg-config --variable=prefix ORBit-2.0`\
-/share/gdm/BuiltInSessions/default.desktop \
-    `pkg-config --variable=prefix ORBit-2.0`\
-/share/xsessions/gnome.desktop</userinput></screen>
+<screen role='root'><userinput>make install</userinput></screen>
 
   </sect2>
 
@@ -118,12 +116,12 @@
     the downside affect of using
     <filename class='directory'>/var/lib/log/gdm</filename> as the log
     directory. See the <quote>Configuration Information</quote> section below
-    for information how to relocate the log file directory.</para>
+    for instructions on relocating the log file directory.</para>
 
     <para><parameter>--with-pam-prefix=/etc</parameter>: This command puts
     <application>PAM</application> configuration files in
     <filename class="directory">/etc/pam.d</filename> instead of
-    <filename class="directory">$gnome-etc-dir;</filename>.</para>
+    <filename class="directory">&gnome-etc-dir;</filename>.</para>
 
   </sect2>
 
@@ -153,12 +151,16 @@
       <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>install -v -m755 -d /var/log/gdm &&
-sed -i "s|var/lib/log|var/log|" &gnome-etc-dir;/gdm/gdm.conf</userinput></screen>
+sed -i "s|var/lib/log|var/log|" &gnome-etc-dir;/gdm/gdm.conf &&
+rmdir -v /var/lib/log/gdm &&
+rmdir -v /var/lib/log</userinput></screen>
 
       <para>The <application>GDM</application> <application>PAM</application>
-      config files contain modules not present in a BLFS installation. The
-      following commands will replace those files (issue as the
-      <systemitem class="username">root</systemitem> user):</para>
+      configuration files contain modules not present in a BLFS installation.
+      If you have <application>PAM</application> installed, issue the following
+      commands as the <systemitem class="username">root</systemitem> user to
+      replace those files with files containing correctly specified
+      modules:</para>
 
 <screen role="root"><userinput>cat > /etc/pam.d/gdm << "EOF"
 <literal>auth        required    pam_unix.so
@@ -204,7 +206,8 @@
 Icon=
 Type=Application</literal>
 
-EOF</userinput></screen>
+EOF
+chmod -v 644 $GNOME_PREFIX/share/xsessions/gnome-dbus.desktop</userinput></screen>
 
       <para>Choose this session using the session selection dialog on the
       display manager login screen. You also have the opportunity to make this
@@ -228,14 +231,14 @@
     <sect3 id="gdm-init">
       <title>Boot Script</title>
 
-      <para>To start a graphical login at boot, install the
+      <para>To start a graphical login when the system is booted, install the
       <filename>/etc/rc.d/init.d/gdm</filename> init script included in the
       <xref linkend="bootscripts"/> package. If your
       <envar>GNOME_PREFIX</envar> environment variable is anything other than
-      <filename class='directory'>/usr</filename> or
-      <filename class='directory'>/opt/gnome-&gnome-version;</filename>, you
-      will need to modify the <envar>PATH</envar> statement in the script to
-      include the path where you have <application>GNOME</application>
+      <filename class='directory'>/usr</filename> or <filename
+      class='directory'>/opt/gnome-&gnome-version;&gnome-minor-version;</filename>,
+      you will need to modify the <envar>PATH</envar> statement in the script
+      to include the path where you have <application>GNOME</application>
       installed.</para>
 
       <indexterm zone="gdm gdm-init">
@@ -266,18 +269,17 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gdm, gdm-binary, gdmXnest, gdmXnestchooser, gdmchooser,
-        gdmflexiserver, gdmgreeter, gdmlogin, gdmphotosetup, gdmsetup,
-        gdmthemetester, gdm-restart, gdm-safe-restart, gdm-stop,
-        gdmconfig, gdmopen, and gdmtranslate</seg>
+        <seg>gdm, gdm-binary, gdm-dmx-reconnect-proxy, gdm-restart,
+        gdm-safe-restart, gdm-stop, gdmXnest, gdmXnestchooser, gdmdynamic,
+        gdmflexiserver, gdmphotosetup, gdmsetup, and gdmthemetester</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/dm, &gnome-etc-dir;/gdm,
-        $GNOME_PREFIX/share/gdm,
-        $GNOME_PREFIX/share/gnome/capplets,
-        $GNOME_PREFIX/share/gnome/help/gdm,
-        $GNOME_PREFIX/share/omf/gdm,
-        $GNOME_PREFIX/share/xsessions,
-        /var/lib/gdm and /var/log/gdm</seg>
+        <seg>&gnome-etc-dir;/[,g]dm, /var/lib/gdm, /var/log/gdm and the
+        following directories in $GNOME_PREFIX/:
+        share/gdm,
+        share/gnome/capplets,
+        share/gnome/help/gdm,
+        share/omf/gdm, and
+        share/xsessions</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -298,28 +300,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="gdmchooser">
-        <term><command>gdmchooser</command></term>
-        <listitem>
-          <para>is an application for selecting XDMCP enabled hosts on
-          the local network.</para>
-          <indexterm zone="gdm gdmchooser">
-            <primary sortas="b-gdmchooser">gdmchooser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdmsetup">
-        <term><command>gdmsetup</command></term>
-        <listitem>
-          <para>is a graphical interface to edit the
-          <filename>gdm.conf</filename> file.</para>
-          <indexterm zone="gdm gdmsetup">
-            <primary sortas="b-gdmsetup">gdmsetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gdm-restart">
         <term><command>gdm-restart</command></term>
         <listitem>
@@ -344,18 +324,16 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="gdmconfig">
-        <term><command>gdmconfig</command></term>
+      <varlistentry id="gdmsetup">
+        <term><command>gdmsetup</command></term>
         <listitem>
-          <para>is an application for managing the configuration of the
-          entire <application>GDM</application> applications suite. It
-          handles look and feel, security, XDMCP, GDMchooser and more.</para>
-          <indexterm zone="gdm gdmconfig">
-            <primary sortas="b-gdmconfig">gdmconfig</primary>
+          <para>is a graphical interface to edit the
+          <filename>gdm.conf</filename> file.</para>
+          <indexterm zone="gdm gdmsetup">
+            <primary sortas="b-gdmsetup">gdmsetup</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
 
   </sect2>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-02-04 22:05:04 UTC (rev 5645)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-02-05 17:38:39 UTC (rev 5646)
@@ -42,6 +42,16 @@
 -->
 
     <listitem>
+      <para>February 5th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated the following GNOME Add-on package
+          instructions to fit the 2.12.2 version changes: GDM</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 4th, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/bootscripts/ChangeLog
===================================================================
--- trunk/bootscripts/ChangeLog	2006-02-04 22:05:04 UTC (rev 5645)
+++ trunk/bootscripts/ChangeLog	2006-02-05 17:38:39 UTC (rev 5646)
@@ -1,3 +1,6 @@
+2006-02-05 Randy McMurchy <randy at linuxfromscratch.org>
+	* Updated the GDM script to the 2.12.2 version of GNOME
+
 2006-01-01 Randy McMurchy <randy at linuxfromscratch.org>
 	* Changed the name of the D-BUS pid file that is removed
 

Modified: trunk/bootscripts/blfs/init.d/gdm
===================================================================
--- trunk/bootscripts/blfs/init.d/gdm	2006-02-04 22:05:04 UTC (rev 5645)
+++ trunk/bootscripts/blfs/init.d/gdm	2006-02-05 17:38:39 UTC (rev 5646)
@@ -10,7 +10,7 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
-export PATH=$PATH:/opt/gnome-2.12/bin:/opt/gnome-2.12/sbin
+export PATH=$PATH:/opt/gnome-2.12.2/bin:/opt/gnome-2.12.2/sbin
 
 case "$1" in
 	start)




More information about the blfs-book mailing list