summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-25 16:19:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-25 16:19:13 +0000
commitfd8293630e710c3da9ce840c57384639c4289209 (patch)
tree475e28aa5b941f081e748c17829970067fbc7777
parentdf33bff820f49cae79519feb8dc1557f85bf3129 (diff)
downloaddrakx-fd8293630e710c3da9ce840c57384639c4289209.tar
drakx-fd8293630e710c3da9ce840c57384639c4289209.tar.gz
drakx-fd8293630e710c3da9ce840c57384639c4289209.tar.bz2
drakx-fd8293630e710c3da9ce840c57384639c4289209.tar.xz
drakx-fd8293630e710c3da9ce840c57384639c4289209.zip
- ensure DPMS screensaver is not triggered during install
(it interacts badly with matchbox/compositing) (#44021)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/gtk.pm4
-rw-r--r--perl-install/install/steps_gtk.pm2
3 files changed, 7 insertions, 1 deletions
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