Sync from SUSE:SLFO:Main accountsservice revision 344ad7a86d58f509c1c52fc5c5db48b3

This commit is contained in:
2025-07-22 00:10:51 +02:00
parent 5222218318
commit a91f72b966
3 changed files with 24 additions and 13 deletions

View File

@@ -61,38 +61,42 @@ Index: accountsservice-23.13.9/src/daemon.c
gboolean
load_autologin (Daemon *daemon,
gchar **name,
@@ -1797,6 +1835,8 @@ load_autologin (Daemon *daemon,
@@ -1797,6 +1835,9 @@ load_autologin (Daemon *daemon,
{
DisplayManagerType dm_type;
+ return load_autologin_suse (daemon, name, enabled, error);
+ if (g_file_test (SYSCONFIG_FILE, G_FILE_TEST_EXISTS))
+ return load_autologin_suse (daemon, name, enabled, error);
+
dm_type = get_current_system_dm_type ();
if (dm_type == DISPLAY_MANAGER_TYPE_LIGHTDM)
return load_autologin_lightdm (daemon, name, enabled, error);
@@ -1819,6 +1859,8 @@ save_autologin_gdm (Daemon *daemon,
@@ -1819,6 +1859,9 @@ save_autologin_gdm (Daemon *daemon,
gboolean result;
g_autoptr (GError) local_error = NULL;
+ return save_autologin_suse (daemon, name, enabled, error);
+ if (g_file_test (SYSCONFIG_FILE, G_FILE_TEST_EXISTS))
+ return save_autologin_suse (daemon, name, enabled, error);
+
keyfile = g_key_file_new ();
if (!g_key_file_load_from_file (keyfile,
PATH_GDM_CUSTOM,
@@ -1851,6 +1893,8 @@ save_autologin_lightdm (Daemon *dae
@@ -1851,6 +1893,9 @@ save_autologin_lightdm (Daemon *dae
gboolean result;
g_autoptr (GError) local_error = NULL;
+ return save_autologin_suse (daemon, name, enabled, error);
+ if (g_file_test (SYSCONFIG_FILE, G_FILE_TEST_EXISTS))
+ return save_autologin_suse (daemon, name, enabled, error);
+
keyfile = g_key_file_new ();
if (!g_key_file_load_from_file (keyfile,
PATH_LIGHTDM_CONF,
@@ -1879,6 +1923,8 @@ save_autologin (Daemon *daemon,
@@ -1879,6 +1923,9 @@ save_autologin (Daemon *daemon,
{
DisplayManagerType dm_type;
+ return save_autologin_suse (daemon, name, enabled, error);
+ if (g_file_test (SYSCONFIG_FILE, G_FILE_TEST_EXISTS))
+ return save_autologin_suse (daemon, name, enabled, error);
+
dm_type = get_current_system_dm_type ();
if (dm_type == DISPLAY_MANAGER_TYPE_LIGHTDM)

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 14 08:00:36 UTC 2025 - Alynx Zhou <alynx.zhou@suse.com>
- Update accountsservice-sysconfig.patch: Check whether sysconfig
is used and fallback to display manager settings if sysconfig is
not used (bsc#1246127).
-------------------------------------------------------------------
Mon Aug 12 17:48:05 UTC 2024 - Michael Gorse <mgorse@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package accountsservice
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed