[28344] in Source-Commits
cluster-login-config commit: Disable shutdown and restart in indicator-session
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jul 22 09:58:34 2014
Date: Tue, 22 Jul 2014 09:58:28 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407221358.s6MDwSEM010839@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/cluster-login-config/commit/695cf6663eb5caf7a2a5f9ce64f2239589df801f
commit 695cf6663eb5caf7a2a5f9ce64f2239589df801f
Author: Jonathan Reed <jdreed@mit.edu>
Date: Tue Jul 8 16:29:53 2014 -0400
Disable shutdown and restart in indicator-session
Disable the "shutdown" and "restart" menu items in indicator-
session, because doing that while you're logged in inside the
chroot wedges your session. (Unity dies, as does everything except
your gnome-terminal, and your session is stuck in "Ending" state)
Also, let lightdm invoke "reboot" via sudo without a passwd
Add dconf keys and locks to disable the user-background for
the unity-greeter (aka the lock screen), force the background
to MIT, and set a custom "logo" in the bottom right
debian/10-cluster-login-config | 7 +++++++
debian/10-cluster-login-config-locks | 5 +++++
debian/changelog | 10 ++++++++++
debian/debathena-cluster-login-config-sudoers | 1 +
debian/debathena-cluster-login-config.install | 1 +
debian/logo.png | Bin 0 -> 1885 bytes
6 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/debian/10-cluster-login-config b/debian/10-cluster-login-config
index cd9717f..655ee65 100644
--- a/debian/10-cluster-login-config
+++ b/debian/10-cluster-login-config
@@ -1,2 +1,9 @@
[apps/indicator-session]
user-show-menu=false
+suppress-restart-menuitem=true
+suppress-shutdown-menuitem=true
+
+[com/canonical/unity-greeter]
+draw-user-backgrounds=false
+background='/usr/share/debathena-lightdm-config/background.jpg'
+logo='/usr/share/debathena-cluster-login-config/logo.png'
diff --git a/debian/10-cluster-login-config-locks b/debian/10-cluster-login-config-locks
index 0f57180..2310fac 100644
--- a/debian/10-cluster-login-config-locks
+++ b/debian/10-cluster-login-config-locks
@@ -1 +1,6 @@
/apps/indicator-session/user-show-menu
+/apps/indicator-session/suppress-restart-menuitem
+/apps/indicator-session/suppress-shutdown-menuitem
+/com/canonical/unity-greeter/draw-user-backgrounds
+/com/canonical/unity-greeter/background
+/com/canonical/unity-greeter/logo
diff --git a/debian/changelog b/debian/changelog
index 40e2372..07c942c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debathena-cluster-login-config (1.43) unstable; urgency=low
+
+ * Suppress the shutdown and restart menu items in indicator-session,
+ since something about the chroot prevents it from working properly.
+ * Let lightdm shut down the machine without a password
+ * Force some dconf keys for the unity-greeter (which is also the lock
+ screen)
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 08 Jul 2014 18:06:16 -0400
+
debathena-cluster-login-config (1.42) unstable; urgency=low
* Combine the two pkla files to disable suspend and hibernate into a
diff --git a/debian/debathena-cluster-login-config-sudoers b/debian/debathena-cluster-login-config-sudoers
index 28e9237..65a48b2 100644
--- a/debian/debathena-cluster-login-config-sudoers
+++ b/debian/debathena-cluster-login-config-sudoers
@@ -2,3 +2,4 @@
ALL !ALL=!ALL
%admin ALL=(ALL) ALL
+lightdm ALL=NOPASSWD: /sbin/reboot
diff --git a/debian/debathena-cluster-login-config.install b/debian/debathena-cluster-login-config.install
index 025d3e7..b704567 100644
--- a/debian/debathena-cluster-login-config.install
+++ b/debian/debathena-cluster-login-config.install
@@ -8,3 +8,4 @@ debian/debathena-cluster-login-config-sudoers etc/sudoers.d
debian/10-cluster-login-config etc/dconf/db/athena.d
debian/10-cluster-login-config-locks etc/dconf/db/athena.d/locks
debian/99-athena.conf usr/share/lightdm/lightdm.conf.d
+debian/logo.png usr/share/debathena-cluster-login-config
diff --git a/debian/logo.png b/debian/logo.png
new file mode 100644
index 0000000..6f26dd5
Binary files /dev/null and b/debian/logo.png differ
