From 6646f8c2a62d8ff7bac22dddb2ccaa4e2b5a2f05 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 30 Aug 2013 14:08:04 -0500
Subject: Move the user into the script and handle the lack of PATH

---
 data/unity-greeter-session-broadcast-session.conf | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf
index a5b744c..db2425c 100644
--- a/data/unity-greeter-session-broadcast-session.conf
+++ b/data/unity-greeter-session-broadcast-session.conf
@@ -6,9 +6,20 @@ task
 emits application-start
 
 #TODO: Check GSettings Key
-start on dbus-system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" PATH="/com/canonical/Unity/Greeter/Broadcast" ARG0=${USER}
+start on dbus BUS=system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" PATH="/com/canonical/Unity/Greeter/Broadcast"
 
 pre-start script
+	PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+
+	if [ -z $ARG0 ] ; then
+		stop
+		exit 1
+	fi
+	if [ $ARG0 != $USER ] ; then
+		stop
+		exit 1
+	fi
+
 	OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner com.canonical.Unity.Greeter.Broadcast | cut -d "'" -f 2`
 
 	if [ -z $OWNER ] ; then
@@ -21,5 +32,4 @@ pre-start script
 	fi
 end script
 
-
-exec initctl emit application-start APP_ID=${ARG1}
+exec /sbin/initctl emit application-start APP_ID=${ARG1}
-- 
cgit v1.2.3