[28291] in Source-Commits
reactivate commit: Fix /sys bind-mount; fix dbus inhibitor
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jul 5 11:57:50 2014
Date: Sat, 5 Jul 2014 11:57:42 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407051557.s65FvgF4032117@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/reactivate/commit/163a597f494aa14f88242e757b62dfb999df8055
commit 163a597f494aa14f88242e757b62dfb999df8055
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Jun 23 16:43:57 2014 -0400
Fix /sys bind-mount; fix dbus inhibitor
- We need to recursively mount /sys, because of things like
/sys/fs/cgroup in the systemd world. (Trac: #1499)
- 90debathena-reactivate should, at startup time, kill the
dbus inhibitor file if it exists (it can be present due to
stale chroots being ended at reboot time by the init.d script
(Trac: #1497)
debian/90debathena-reactivate | 4 ++++
debian/athena/fstab | 2 +-
debian/changelog | 9 +++++++++
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/debian/90debathena-reactivate b/debian/90debathena-reactivate
index 1705d0b..d3237b7 100755
--- a/debian/90debathena-reactivate
+++ b/debian/90debathena-reactivate
@@ -20,6 +20,10 @@ fi
if [ $STAGE = "setup-start" ]; then
info "Adding messagebus to access list for session ${SESSION_ID}"
sed -i "/^root-users/s/$/,messagebus/" /var/lib/schroot/session/"${SESSION_ID}"
+ if [ -e /var/run/debathena-inhibit-dbus-helper ]; then
+ info "Removing stale dbus inhibit file"
+ rm /var/run/debathena-inhibit-dbus-helper
+ fi
fi
if [ $STAGE = "setup-stop" ]; then
diff --git a/debian/athena/fstab b/debian/athena/fstab
index 8607bd6..94fc251 100644
--- a/debian/athena/fstab
+++ b/debian/athena/fstab
@@ -3,7 +3,7 @@
#
# <file system> <mount point> <type> <options> <dump> <pass>
/proc /proc none rw,bind 0 0
-/sys /sys none rw,bind 0 0
+/sys /sys none rw,rbind 0 0
/dev /dev none rw,bind 0 0
/dev/pts /dev/pts none rw,bind 0 0
/run /run none rw,rbind 0 0
diff --git a/debian/changelog b/debian/changelog
index c9f27fe..96d7a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debathena-reactivate (2.0.47) UNRELEASED; urgency=low
+
+ * Ensure the dbus-inhibitor file is gone when the chroot starts up.
+ (Ending stale chroots will cause the file to stick around)
+ (Trac: #1497)
+ * bind-mount /sys with rbind (Trac: #1499)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 23 Jun 2014 16:43:35 -0400
+
debathena-reactivate (2.0.46) unstable; urgency=low
* Tweak schroot configuration to support both schroot 1.4 and 1.6
