[25635] in Source-Commits
/svn/athena r25138 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 15 09:53:32 2011
Date: Wed, 15 Jun 2011 09:53:26 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106151353.p5FDrQaw019697@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-15 09:53:26 -0400 (Wed, 15 Jun 2011)
New Revision: 25138
Added:
trunk/debathena/config/cluster-login-config/debian/disable-hibernate.pkla
trunk/debathena/config/cluster-login-config/debian/disable-suspend.pkla
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
Log:
In cluster-login-config:
* Use polkit to disable suspend and hiberate (Trac #684)
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2011-06-14 20:33:26 UTC (rev 25137)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-06-15 13:53:26 UTC (rev 25138)
@@ -1,3 +1,9 @@
+debathena-cluster-login-config (1.32) unstable; urgency=low
+
+ * Use polkit to disable suspend and hiberate (Trac #684)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 15 Jun 2011 09:47:54 -0400
+
debathena-cluster-login-config (1.31) unstable; urgency=low
* Add necessary files to enable backports and pin everything except
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-06-14 20:33:26 UTC (rev 25137)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-06-15 13:53:26 UTC (rev 25138)
@@ -4,3 +4,5 @@
debian/screensaver_logout.sh usr/share/debathena-cluster-login-config
debian/debathena-backports.list etc/apt/sources.list.d
debian/debathena-libstdcplusplus.pref etc/apt/preferences.d
+debian/disable-suspend.pkla etc/polkit-1/localauthority/30-site.d
+debian/disable-hibernate.pkla etc/polkit-1/localauthority/30-site.d
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-06-14 20:33:26 UTC (rev 25137)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-06-15 13:53:26 UTC (rev 25138)
@@ -151,6 +151,7 @@
$gc -t bool /apps/fast-user-switch-applet/show_guest_login false
# gnome-power-manager
+ # As of Lucid, these are ignored and polkit is used instead
$gc -t bool /apps/gnome-power-manager/general/can_hibernate false
$gc -t bool /apps/gnome-power-manager/general/can_suspend false
Added: trunk/debathena/config/cluster-login-config/debian/disable-hibernate.pkla
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/disable-hibernate.pkla (rev 0)
+++ trunk/debathena/config/cluster-login-config/debian/disable-hibernate.pkla 2011-06-15 13:53:26 UTC (rev 25138)
@@ -0,0 +1,5 @@
+[Disable hibernate]
+Identity=unix-user:*
+Action=org.freedesktop.upower.hibernate
+ResultActive=no
+ResultAny=no
Added: trunk/debathena/config/cluster-login-config/debian/disable-suspend.pkla
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/disable-suspend.pkla (rev 0)
+++ trunk/debathena/config/cluster-login-config/debian/disable-suspend.pkla 2011-06-15 13:53:26 UTC (rev 25138)
@@ -0,0 +1,5 @@
+[Disable suspend]
+Identity=unix-user:*
+Action=org.freedesktop.upower.suspend
+ResultActive=no
+ResultAny=no
