[26439] in Source-Commits
/svn/athena r25575 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jun 5 17:00:54 2012
Date: Tue, 5 Jun 2012 17:00:53 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206052100.q55L0rja028609@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-05 17:00:53 -0400 (Tue, 05 Jun 2012)
New Revision: 25575
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper
Log:
In reactivate:
* dbus-daemon-launch-helper moved in precise
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2012-06-05 20:39:27 UTC (rev 25574)
+++ trunk/debathena/config/reactivate/debian/changelog 2012-06-05 21:00:53 UTC (rev 25575)
@@ -1,3 +1,9 @@
+debathena-reactivate (2.0.34) unstable; urgency=low
+
+ * dbus-daemon-launch-helper moved in precise
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 05 Jun 2012 17:00:48 -0400
+
debathena-reactivate (2.0.33) unstable; urgency=low
* Actually install the diverted lightdm-session.debathena file
Modified: trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper
===================================================================
--- trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper 2012-06-05 20:39:27 UTC (rev 25574)
+++ trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper 2012-06-05 21:00:53 UTC (rev 25575)
@@ -4,8 +4,12 @@
session=$(schroot -l --all-sessions)
fi
+HELPER=/lib/dbus-1.0/dbus-daemon-launch-helper
+[ -x "$HELPER" ] || HELPER="/usr${HELPER}"
+[ -x "$HELPER" ] || logger -t "reactivate" "Can't execute $HELPER"
+
if [ -n "$session" ] && [ "$(echo "$session" | wc -l)" -eq 1 ]; then
- exec schroot -r -c "$session" /lib/dbus-1.0/dbus-daemon-launch-helper "$@"
+ exec schroot -r -c "$session" "$HELPER" "$@"
else
- exec /lib/dbus-1.0/dbus-daemon-launch-helper "$@"
+ exec "$HELPER" "$@"
fi
