summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-08 13:46:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-08 13:46:49 +0000
commitb69aa98d85d3f324de82dbd5bb0583aa1a733c71 (patch)
tree65546405e67875db3bbc22dcb7532daec2732ef9 /perl-install
parentb1f1c453f65a15de3fcfaf1f551bb5477836933f (diff)
downloaddrakx-b69aa98d85d3f324de82dbd5bb0583aa1a733c71.tar
drakx-b69aa98d85d3f324de82dbd5bb0583aa1a733c71.tar.gz
drakx-b69aa98d85d3f324de82dbd5bb0583aa1a733c71.tar.bz2
drakx-b69aa98d85d3f324de82dbd5bb0583aa1a733c71.tar.xz
drakx-b69aa98d85d3f324de82dbd5bb0583aa1a733c71.zip
in standalone, use monitor-edid's new option --try-in-console
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/drakxtools.spec2
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 87454ef10..f56831cad 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1027,7 +1027,9 @@ sub monitor_full_edid() {
devices::make('zero');
my ($vbe, $edid);
- run_program::raw({ timeout => 20 }, 'monitor-edid', '>', \$edid, '2>', \$vbe, '-v', '--perl');
+ run_program::raw({ timeout => 20 },
+ 'monitor-edid', '>', \$edid, '2>', \$vbe,
+ '-v', '--perl', if_($::isStandalone, '--try-in-console'));
if ($::isInstall) {
foreach (['edid', \$edid], ['vbe', \$vbe]) {
my ($name, $val) = @$_;
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index b51a97191..177d2b72c 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -25,7 +25,7 @@ Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
Group: System/Configuration/Other
Requires: perl-base >= 2:5.8.6-1mdk, urpmi >= 4.6.13, modutils >= 2.3.11, usermode-consoleonly >= 1.44-4mdk, msec >= 0.38-5mdk
Requires: %{name}-backend = %version-%release
-Requires: monitor-edid
+Requires: monitor-edid >= 1.5
Requires: netprofile
Obsoletes: diskdrake kbdconfig mouseconfig printtool setuptool drakfloppy
Provides: diskdrake, kbdconfig mouseconfig printtool setuptool, drakfloppy = %version-%release