Sophie

Sophie

distrib > Mandriva > 2010.1 > x86_64 > by-pkgid > c902a7a4b130e09ad7018c0ff180989e > files > 17

gdm-2.30.2-12mdv2010.1.src.rpm

From e02dd7df3849e424e4870dc3a4b2eb8f439359ba Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Tue, 30 Mar 2010 18:48:03 +0200
Subject: [PATCH 14/14] run script for Init as root and ensure PATH is right

---
 daemon/gdm-simple-slave.c |    4 ++--
 data/Init.in              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 18fb565..165b111 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1048,7 +1048,7 @@ start_greeter (GdmSimpleSlave *slave)
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "root");
 
         slave->priv->greeter_server = gdm_greeter_server_new (display_id);
         g_signal_connect (slave->priv->greeter_server,
@@ -1163,7 +1163,7 @@ idle_connect_to_display (GdmSimpleSlave *slave)
                         create_new_session (slave);
                 } else {
                         /* Run the init script. gdmslave suspends until script has terminated */
-                        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
+                        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "root");
                         reset_session (slave);
                 }
         } else {
diff --git a/data/Init.in b/data/Init.in
index 4c9ff8d..c29081d 100644
--- a/data/Init.in
+++ b/data/Init.in
@@ -3,7 +3,7 @@
 # Plus a lot of fun stuff added
 #  -George
 
-PATH="@X_PATH@:$PATH"
+export PATH="/sbin:/usr/sbin:$PATH:/usr/local/sbin:/usr/local/bin"
 
 if [ -x /etc/X11/xinit/fixkeyboard ]; then
    /etc/X11/xinit/fixkeyboard
-- 
1.7.0.3