File sysconfig-support.patch of Package sddm

Overview Repositories Revisions Requests Users Attributes Meta

File sysconfig-support.patch of Package sddm (Revision 5aca468cda4787592dcedddcf9dc0d94)

Currently displaying revision 5aca468cda4787592dcedddcf9dc0d94 , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d6e0a9d1bdb0742bf5ae23a522091f3f1d14dda..a2af8bb6559826252b8abe63217eca1cacb5d842 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,7 @@ set(RUNTIME_DIR                 "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/sddm"
 set(SESSION_COMMAND             "${DATA_INSTALL_DIR}/scripts/Xsession"              CACHE PATH      "Script to execute when starting the desktop session")
 
 set(CONFIG_FILE                 "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"        CACHE PATH      "Path of the sddm config file")
+set(DYSPLAY_MANAGER_CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sysconfig/displaymanager"        CACHE PATH      "Path of the sysconfig/displaymanager config file")
 set(LOG_FILE                    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log"  CACHE PATH      "Path of the sddm log file")
 set(COMPONENTS_TRANSLATION_DIR  "${DATA_INSTALL_DIR}/translations"                  CACHE PATH      "Components translations directory")
 
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
index 72aa6f4..95447c1 100644
--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
@@ -75,14 +75,14 @@ namespace SDDM {
         );
         Section(Autologin,
             Entry(User,                QString,     QString(),                                  _S("Autologin user"));
-            Entry(Session,             QString,     QString(),                                  _S("Autologin session"));
+            Entry(Session,             QString,     _S("plasma5.desktop"),                      _S("Autologin session"));
             Entry(Relogin,             bool,        false,                                      _S("Autologin again on session exit"));
         );
     );
 
     Config(StateConfig, []()->QString{auto tmp = getpwnam("sddm"); return tmp ? tmp->pw_dir : STATE_DIR;}().append("/state.conf"),
         Section(Last,
-            Entry(Session,         QString,     QString(),                                  _S("Name of the session file of the last session selected. This session will be preselected when the login screen shows up."));
+            Entry(Session,         QString,     _S("plasma5.desktop"),                      _S("Name of the session file of the last session selected. This session will be preselected when the login screen shows up."));
             Entry(User,            QString,     QString(),                                  _S("Name of the last logged-in user. This username will be preselected/shown when the login screen shows up"));
         );
     );
diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in
index 654331d6f22ce2c90ca510678cd137308c1000bd..9ca4b8c05f1d4b9a3533dbce83df0e12979a4809 100644
--- a/src/common/Constants.h.in
+++ b/src/common/Constants.h.in
@@ -32,6 +32,7 @@
 #define SESSION_COMMAND             "@SESSION_COMMAND@"
 
 #define CONFIG_FILE                 "@CONFIG_FILE@"
+#define DYSPLAY_MANAGER_CONFIG_FILE "@DYSPLAY_MANAGER_CONFIG_FILE@"
 #define LOG_FILE                    "@LOG_FILE@"
 #define PID_FILE                    "@PID_FILE@"
 #define MINIMUM_VT                  @MINIMUM_VT@
diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
index 87d0cc37c0f97b801ba1b7ffd1dd534e9fe92875..2f15cc62976d661977905f9964a1a558facc126c 100644
--- a/src/daemon/Display.cpp
+++ b/src/daemon/Display.cpp
@@ -35,6 +35,7 @@
 #include <QDir>
 #include <QFile>
 #include <QTimer>
+#include <QSettings>
 
 #include <pwd.h>
 #include <unistd.h>
@@ -113,8 +114,19 @@ namespace SDDM {
         // log message
         qDebug() << "Display server started.";
 
+        QSettings sysconfSettings(DYSPLAY_MANAGER_CONFIG_FILE, QSettings::NativeFormat);
+        QString sysconfigUser = sysconfSettings.value("DISPLAYMANAGER_AUTOLOGIN", "").toString();
+
+        if (!sysconfigUser.isEmpty()) {
+            mainConfig.Autologin.User.set(sysconfigUser);
+            mainConfig.save();
+        } else  {
+            mainConfig.Autologin.User.set(QString());
+            mainConfig.save();
+        }
+
         if ((daemonApp->first || mainConfig.Autologin.Relogin.get()) &&
-            !mainConfig.Autologin.User.get().isEmpty() && !mainConfig.Autologin.Session.get().isEmpty()) {
+            !mainConfig.Autologin.User.get().isEmpty()) {
             // reset first flag
             daemonApp->first = false;

Places

File sysconfig-support.patch of Package sddm (Revision 5aca468cda4787592dcedddcf9dc0d94)

Places