From 82af1cc07a24f33e5f7eae8fd2e7badaa7d940bb Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Fri, 11 May 2012 16:29:57 +0000
Subject: disable suspend and hibernate in live mode

---
 config/live.cfg                             |  3 ++-
 files/50-disable-suspend.pkla               |  6 ++++++
 files/99-live-disable-suspend-hibernate.fdi | 11 -----------
 3 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100755 files/50-disable-suspend.pkla
 delete mode 100755 files/99-live-disable-suspend-hibernate.fdi

diff --git a/config/live.cfg b/config/live.cfg
index e9d84c3..94ef717 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -36,10 +36,11 @@ my $_l = {
                 [ 'files/portable-directories-liveusb-rw', '/etc/X11/xinit.d/portable-directories-liveusb-rw', { mode => 0755, no_install => 1 } ],
             ),
             if_($live->{settings}{media} eq 'usb',
-                [ 'files/99-live-disable-suspend-hibernate.fdi', '/etc/hal/fdi/policy/99-live-disable-suspend-hibernate.fdi', { mode => 0644, no_install => 1 } ],
                 [ 'files/desktop-directories-liveusb-rw', '/etc/X11/xinit.d/xx_desktop-directories-liveusb-rw', { mode => 0755, no_install => 1 } ],
                 [ 'files/draklive-install.usb', '/etc/sysconfig/draklive-install', { mode => 0755 } ],
             ),
+            # disable suspend and hibernate in live mode
+            [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
             #- make cups the default spooler
             [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ],
             if_($live->{settings}{media} eq 'CD',
diff --git a/files/50-disable-suspend.pkla b/files/50-disable-suspend.pkla
new file mode 100755
index 0000000..7c92300
--- /dev/null
+++ b/files/50-disable-suspend.pkla
@@ -0,0 +1,6 @@
+[Disable Suspend]
+Identity=unix-user:*
+Action=org.freedesktop.upower.hibernate;org.freedesktop.upower.suspend
+ResultAny=no
+ResultInactive=no
+ResultActive=no
diff --git a/files/99-live-disable-suspend-hibernate.fdi b/files/99-live-disable-suspend-hibernate.fdi
deleted file mode 100755
index 96f1767..0000000
--- a/files/99-live-disable-suspend-hibernate.fdi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
-          <merge key="power_management.can_hibernate" type="bool">false</merge>
-          <merge key="power_management.can_suspend" type="bool">false</merge>
-          <merge key="power_management.can_suspend_to_disk" type="bool">false</merge>
-          <merge key="power_management.can_suspend_to_ram" type="bool">false</merge>
-    </match>
-  </device>
-</deviceinfo>
-- 
cgit v1.2.1