From fd8293630e710c3da9ce840c57384639c4289209 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 25 Sep 2008 16:19:13 +0000
Subject: - ensure DPMS screensaver is not triggered during install   (it
 interacts badly with matchbox/compositing) (#44021)

---
 perl-install/install/NEWS         | 2 ++
 perl-install/install/gtk.pm       | 4 ++++
 perl-install/install/steps_gtk.pm | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b297f3317..514058794 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- ensure DPMS screensaver is not triggered during install
+  (it interacts badly with matchbox/compositing) (#44021)
 - generate /root/drakx/package_list.pl at end of install 
   (since we don't propose "Save packages selection" at end of install)
 - generate /var/lib/rpm/installed-through-deps.list
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 0055221d9..28b0ec6f8 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -309,6 +309,10 @@ Section "Screen"
 EndSection
 
 Section "ServerLayout"
+    Option "BlankTime"   "0"
+    Option "StandbyTime" "0"
+    Option "SuspendTime" "0"
+    Option "OffTime"     "0"
     Identifier "layout"
     Screen "screen"
     InputDevice "Mouse" "CorePointer"
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index f25330d5d..555a0b47a 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -57,7 +57,7 @@ sub new($$) {
 		install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver);
 
 		push @options, '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
-		push @options, 'vt7', '-s', '240', '-dpi', '75';
+		push @options, 'vt7', '-dpi', '75';
 		push @options, '-nolisten', 'tcp';
 
 		#- old weird servers: Xsun
-- 
cgit v1.2.1