[Pkg-xfce-commits] r5871 - goodies/trunk/lightdm/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Jul 25 08:14:01 UTC 2011
Author: corsac
Date: 2011-07-25 08:14:01 +0000 (Mon, 25 Jul 2011)
New Revision: 5871
Modified:
goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
goodies/trunk/lightdm/debian/patches/series
Log:
re-add default-path
Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-07-25 08:13:46 UTC (rev 5870)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-07-25 08:14:01 UTC (rev 5871)
@@ -2,16 +2,19 @@
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
Description: Fix default PATH environment variable
-diff --git a/src/display.c b/src/display.c
-index 61267f0..c4b1971 100644
---- a/src/display.c
-+++ b/src/display.c
-@@ -591,7 +591,7 @@ start_user_session (Display *display, co
+Index: lightdm-0.9.0/src/session.c
+===================================================================
+--- lightdm-0.9.0.orig/src/session.c 2011-07-25 10:04:17.574295273 +0200
++++ lightdm-0.9.0/src/session.c 2011-07-25 10:05:20.008107795 +0200
+@@ -47,7 +47,10 @@
+ g_object_unref (session->priv->user);
+ session->priv->user = g_object_ref (user);
- session_set_user (display->priv->user_session, user);
- session_set_command (display->priv->user_session, session_command);
-- child_process_set_env (CHILD_PROCESS (display->priv->user_session), "PATH", "/usr/local/bin:/usr/bin:/bin");
-+ child_process_set_env (CHILD_PROCESS (display->priv->user_session), "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
- child_process_set_env (CHILD_PROCESS (display->priv->user_session), "USER", user_get_name (user));
- child_process_set_env (CHILD_PROCESS (display->priv->user_session), "USERNAME", user_get_name (user)); // FIXME: Is this required?
- child_process_set_env (CHILD_PROCESS (display->priv->user_session), "HOME", user_get_home_directory (user));
+- process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin");
++ if (user_get_uid (user) == 0)
++ process_set_env (PROCESS (session), "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
++ else
++ process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
+ process_set_env (PROCESS (session), "USER", user_get_name (user));
+ process_set_env (PROCESS (session), "USERNAME", user_get_name (user)); // FIXME: Is this required?
+ process_set_env (PROCESS (session), "HOME", user_get_home_directory (user));
Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-07-25 08:13:46 UTC (rev 5870)
+++ goodies/trunk/lightdm/debian/patches/series 2011-07-25 08:14:01 UTC (rev 5871)
@@ -1,2 +1,3 @@
+01_set-default-path.patch
02_default-config.patch
03_quit-plymouth.patch
More information about the Pkg-xfce-commits
mailing list