Changeset 5eb0d00

Timestamp:

07/28/2014 11:03:46 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

e19c416

Parents:

3fd942c3

Message:

Revert xserver change. xinit package is the real culprit.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13726 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/installing/xorg-server-systemd.xml (modified) (3 diffs)

x/installing/xorg-server-systemd.xml

@@ -96 +96 @@
     <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>
 
@@ -133 +133 @@
            --enable-dmx                     \
            --enable-glamor                  \
-           --enable-setuid-install          \
-           --disable-systemd-logind         &amp;&amp;
+           --enable-suid-wrapper            &amp;&amp;
 make</userinput></screen>
 
@@ -165 +164 @@
 
     <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>