diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | draklive-install.wrapper | 26 |
2 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,5 @@ +- disable screensaver/lock whilst installer is running + 2.15 - revised template for matching live media disk labels - translation updates diff --git a/draklive-install.wrapper b/draklive-install.wrapper index 5a8f4eb..1da9f0e 100755 --- a/draklive-install.wrapper +++ b/draklive-install.wrapper @@ -1,6 +1,20 @@ -#!/bin/sh -if [[ "$UID" != "0" ]] ; then - /usr/bin/pkexec /usr/sbin/draklive-install-lock-storage "$@" - exit $? -fi -exec /usr/sbin/draklive-install-lock-storage "$@" +#!/bin/perl +use Net::DBus; + +if ($>) { + if (system('ps -C xscreensaver') == 0) { + # xscreensaver doesn't implement the freedesktop API, so we just have to kill it, + # We expect the user to reboot after the install completes, so don't bother to + # reenable it. + system('xscreensaver-command -exit'); + } else { + my $bus = Net::DBus->session; + my $service = $bus && $bus->get_service('org.freedesktop.ScreenSaver'); + my $manager = $service && $service->get_object('/ScreenSaver', 'org.freedesktop.ScreenSaver'); + my $cookie = $manager && $manager->Inhibit('draklive-install', 'Install in progress'); + # The screensaver will be automatically uninhibited when this process exits. + } + my $status = system("/usr/bin/pkexec /usr/sbin/draklive-install-lock-storage @ARGV"); + exit($status); +} +exec("/usr/sbin/draklive-install-lock-storage @ARGV"); |