Merge pull request #72400 from worldofpeace/fix/accountsservice
accountsservice: fix vendor extensions
This commit is contained in:
commit
021a5cc6ab
@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
|
|||||||
})
|
})
|
||||||
./no-create-dirs.patch
|
./no-create-dirs.patch
|
||||||
./Disable-methods-that-change-files-in-etc.patch
|
./Disable-methods-that-change-files-in-etc.patch
|
||||||
|
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
|
||||||
|
./drop-prefix-check-extensions.patch
|
||||||
# Systemd unit improvements. Notably using StateDirectory eliminating the
|
# Systemd unit improvements. Notably using StateDirectory eliminating the
|
||||||
# need of an ad-hoc script.
|
# need of an ad-hoc script.
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/src/extensions.c b/src/extensions.c
|
||||||
|
index 038dcb2..830465d 100644
|
||||||
|
--- a/src/extensions.c
|
||||||
|
+++ b/src/extensions.c
|
||||||
|
@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Ensure it looks like "../../dbus-1/interfaces/${name}" */
|
||||||
|
- const gchar * const prefix = "../../dbus-1/interfaces/";
|
||||||
|
- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
|
||||||
|
- daemon_read_extension_file (ifaces, filename);
|
||||||
|
- }
|
||||||
|
- else {
|
||||||
|
- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
|
||||||
|
- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
|
||||||
|
- filename, name);
|
||||||
|
- }
|
||||||
|
+ daemon_read_extension_file (ifaces, filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_dir_close (dir);
|
Loading…
x
Reference in New Issue
Block a user