[26566] in Source-Commits
/svn/athena r25630 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 9 14:19:34 2012
Date: Mon, 9 Jul 2012 14:19:32 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207091819.q69IJWTP029150@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-09 14:19:32 -0400 (Mon, 09 Jul 2012)
New Revision: 25630
Added:
trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper-blacklist
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper
trunk/debathena/config/reactivate/debian/debathena-reactivate.install
Log:
In reactivate:
* Implement a blacklist for services that should never start inside the
chroot
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2012-07-09 14:42:42 UTC (rev 25629)
+++ trunk/debathena/config/reactivate/debian/changelog 2012-07-09 18:19:32 UTC (rev 25630)
@@ -1,8 +1,10 @@
debathena-reactivate (2.0.37) unstable; urgency=low
* Set the time in reactivate, because NTP apparently can't (Trac: #749)
+ * Implement a blacklist for services that should never start inside the
+ chroot
- -- Jonathan Reed <jdreed@mit.edu> Sun, 08 Jul 2012 20:40:27 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 09 Jul 2012 14:16:53 -0400
debathena-reactivate (2.0.36) unstable; urgency=low
Modified: trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper
===================================================================
--- trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper 2012-07-09 14:42:42 UTC (rev 25629)
+++ trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper 2012-07-09 18:19:32 UTC (rev 25630)
@@ -8,8 +8,11 @@
[ -x "$HELPER" ] || HELPER="/usr${HELPER}"
[ -x "$HELPER" ] || logger -t "reactivate" "Can't execute $HELPER"
+BLACKLIST=/usr/share/debathena-reactivate/dbus-daemon-launch-helper-blacklist
+
if [ -n "$session" ] && [ "$(echo "$session" | wc -l)" -eq 1 ] && \
- ! [ -e /var/run/debathena-inhibit-dbus-helper ]; then
+ ! [ -e /var/run/debathena-inhibit-dbus-helper ] && \
+ ! grep -Fxq "$1" "$BLACKLIST"; then
exec schroot -r -c "$session" "$HELPER" "$@"
else
exec "$HELPER" "$@"
Added: trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper-blacklist
===================================================================
--- trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper-blacklist (rev 0)
+++ trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper-blacklist 2012-07-09 18:19:32 UTC (rev 25630)
@@ -0,0 +1,6 @@
+# A list of D-Bus names to never start inside in the chroot
+# Format: One name per line
+
+# Never start rtkit-daemon inside the chroot, since it
+# does a chroot itself into /proc, and bad things happen
+org.freedesktop.RealtimeKit1
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.install
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2012-07-09 14:42:42 UTC (rev 25629)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2012-07-09 18:19:32 UTC (rev 25630)
@@ -18,3 +18,4 @@
debian/dbus-daemon-launch-helper lib/debathena-reactivate
debian/90debathena-reactivate etc/schroot/setup.d
debian/16killprocs-no-really etc/schroot/setup.d
+debian/dbus-daemon-launch-helper-blacklist usr/share/debathena-reactivate
