Changeset f2cedb8 for x/dm

Timestamp:

09/09/2016 09:46:04 AM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

9c7fa81

Parents:

34706a0a

Message:

Fix SDDM on systemd systems

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17750 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/dm/sddm.xml (modified) (10 diffs)

x/dm/sddm.xml

@@ -17 +17 @@
 ]>
 
-<sect1 id="sddm" xreflabel="sddm-&sddm-version;" revision='sysv'>
+<sect1 id="sddm" xreflabel="sddm-&sddm-version;">
   <?dbhtml filename="sddm.html"?>
 
@@ -122 +122 @@
          -s /bin/false sddm</userinput></screen>
 
-    <para>
+    <para revision="sysv">
       Next, fix the application to start <command>upowerd</command>,
       if necessary, and after login, start the session with
@@ -128 +128 @@
     </para>
 
-<screen><userinput>sed -e '/UPOWER_SERVICE)/ s:^://:' \
+<screen revision="sysv"><userinput>sed -e '/UPOWER_SERVICE)/ s:^://:' \
     -i src/daemon/PowerManager.cpp &amp;&amp;
 
@@ -139 +139 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
@@ -149 +149 @@
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
     <para>
       This package does not come with a test suite.
@@ -170 +178 @@
     </para>
 
-    <para>
+    <para revision="sysv">
       <parameter>-DENABLE_JOURNALD=OFF</parameter>: This switch is used because
       BLFS does not support <application>systemd</application>.
     </para>
 
-    <para>
+    <para revision="sysv">
       <parameter>-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf</parameter>:
       This switch prevents the file <filename>
@@ -288 +296 @@
 
       <para>
-        Install the <filename>/etc/rc.d/init.d/sddm</filename> init script from
+        Install the <filename revision="sysv">/etc/rc.d/init.d/sddm</filename> init script from
         the <xref linkend="bootscripts" revision="sysv"/>
         <xref linkend="systemd-units" revision="systemd"/> package.
@@ -297 +305 @@
       </indexterm>
 
-<screen role="root"><userinput>make install-sddm</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make install-sddm</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable sddm</userinput></screen>
 
     </sect3>
@@ -312 +322 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF"
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF"
 <literal># Begin /etc/pam.d/sddm
 
@@ -363 +373 @@
 EOF</userinput></screen>
 
+<screen role="root" revision="systemd"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/pam.d/sddm
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid &gt;=1000 quiet
+auth     include        system-auth
+
+account  include        system-account
+password include        system-password
+
+session  required       pam_limits.so
+session  include        system-session
+
+# End /etc/pam.d/sddm</literal>
+EOF
+
+cat &gt; /etc/pam.d/sddm-autologin &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/pam.d/sddm-autologin
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid &gt;=1000 quiet
+auth     required       pam_permit.so
+
+account  include        system-account
+
+password required       pam_deny.so
+
+session  required       pam_limits.so
+session  include        system-session
+
+# End /etc/pam.d/sddm-autologin</literal>
+EOF
+
+cat &gt; /etc/pam.d/sddm-greeter &lt;&lt; "EOF"
+<literal># Begin /etc/pam.d/sddm-greeter
+
+auth     required       pam_env.so
+auth     required       pam_permit.so
+
+account  required       pam_permit.so
+password required       pam_deny.so
+session  required       pam_unix.so
+-session optional       pam_systemd.so
+
+# End /etc/pam.d/sddm-greeter</literal>
+EOF</userinput></screen>
+
     </sect3>
 
-    <sect3 id="sddm-init">
+    <sect3 id="sddm-init" revision="sysv">
       <title>Starting sddm</title>