646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
|
|
index 9ef4c5b..94da834 100644
|
|
--- a/daemon/gdm-session-worker.c
|
|
+++ b/daemon/gdm-session-worker.c
|
|
@@ -1515,6 +1515,16 @@ gdm_session_worker_load_env_d (GdmSessionWorker *worker)
|
|
g_object_unref (dir);
|
|
}
|
|
|
|
+static void
|
|
+gdm_session_worker_forward_var (GdmSessionWorker *worker, char const *var)
|
|
+{
|
|
+ char const *value = g_getenv(var);
|
|
+ if (value != NULL) {
|
|
+ g_debug ("forwarding %s= %s", var, value);
|
|
+ gdm_session_worker_set_environment_variable(worker, var, value);
|
|
+ }
|
|
+}
|
|
+
|
|
static gboolean
|
|
gdm_session_worker_accredit_user (GdmSessionWorker *worker,
|
|
GError **error)
|
|
@@ -1559,6 +1569,9 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker,
|
|
goto out;
|
|
}
|
|
|
|
+ gdm_session_worker_forward_var(worker, "GDM_X_SERVER_EXTRA_ARGS");
|
|
+ gdm_session_worker_forward_var(worker, "GDM_X_SESSION_WRAPPER");
|
|
+
|
|
gdm_session_worker_update_environment_from_passwd_info (worker,
|
|
uid,
|
|
gid,
|