Author: krejzi
Date: Mon Jul 28 16:03:46 2014
New Revision: 13726

Log:
Revert xserver change. xinit package is the real culprit.

Modified:
   branches/systemd/x/installing/xorg-server-systemd.xml

Modified: branches/systemd/x/installing/xorg-server-systemd.xml
==============================================================================
--- branches/systemd/x/installing/xorg-server-systemd.xml       Mon Jul 28 
15:41:28 2014        (r13725)
+++ branches/systemd/x/installing/xorg-server-systemd.xml       Mon Jul 28 
16:03:46 2014        (r13726)
@@ -95,8 +95,8 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="libepoxy"/> and
-      <xref linkend="wayland"/> (for <command>Xwayland</command>)<!-- and
-      <xref linkend="systemd"/> (for Logind)-->
+      <xref linkend="wayland"/> (for <command>Xwayland</command>) and
+      <xref linkend="systemd"/> (for Logind)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -132,8 +132,7 @@
            --with-xkb-output=/var/lib/xkb   \
            --enable-dmx                     \
            --enable-glamor                  \
-           --enable-setuid-install          \
-           --disable-systemd-logind         &amp;&amp;
+           --enable-suid-wrapper            &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -164,29 +163,17 @@
     </para>
 
     <para>
-      <parameter>--enable-install-setuid</parameter>: The Xorg binary must run 
as
-      the root user. This switch ensures that the binary is installed
-      setuid when <command>make</command> is run by an unprivileged user.
-    </para>
-
-    <para>
-      <parameter>--disable-systemd-logind</parameter>: This switch disables
-      <application>systemd</application> logind support because it causes
-      no small amount of trouble when enabled.
-    </para>
-<!--
-    <para>
-      <parameter>- -enable-suid-wrapper</parameter>: This switch enables 
building of
+      <parameter>--enable-suid-wrapper</parameter>: This switch enables 
building of
       the suid-root wrapper for legacy driver support on rootless xserver 
systems.
     </para>
 
     <para>
-      <option>- -enable-install-setuid</option>: Use this switch if you have 
not
+      <option>--enable-install-setuid</option>: Use this switch if you have not
       reinstalled <application>systemd</application> with Logind support and
       wish to run the <application>Xorg Server</application> as the
       <systemitem class="username">root</systemitem> user.
     </para>
--->
+
   </sect2>
 
   <sect2 role="content">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to