summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-09 13:08:58 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-09 13:08:58 +0000
commit3ad06f538c28936e61f152a4cdf2db94bacdc92c (patch)
tree1702df006e4e0238fd5f1805439fe683740e974a
parent817828dc0b30a7edfd7ba1f39f8f03672e55ec16 (diff)
downloaddrakx-3ad06f538c28936e61f152a4cdf2db94bacdc92c.tar
drakx-3ad06f538c28936e61f152a4cdf2db94bacdc92c.tar.gz
drakx-3ad06f538c28936e61f152a4cdf2db94bacdc92c.tar.bz2
drakx-3ad06f538c28936e61f152a4cdf2db94bacdc92c.tar.xz
drakx-3ad06f538c28936e61f152a4cdf2db94bacdc92c.zip
*** empty log message ***
-rw-r--r--perl-install/Xconfigurator.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 2c79b6b09..09aef33f7 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -19,10 +19,6 @@ my ($prefix, %cards, %monitors);
sub getVGAMode($) { $_[0]->{card}{vga_mode} || $vgamodes{"640x480x16"}; }
-sub restart_xfs() {
- run_program::rooted($prefix, "/etc/rc.d/init.d/xfs", $_) foreach "stop", "start";
-}
-
sub setVirtual($) {
my $vt = '';
local *C;
@@ -229,7 +225,7 @@ sub testConfig($) {
write_XF86Config($o, $tmpconfig);
unlink "/tmp/.X9-lock";
- restart_xfs;
+ #- restart_xfs;
local *F;
open F, "$prefix$o->{card}{prog} :9 -probeonly -pn -xf86config $tmpconfig 2>&1 |";
@@ -274,7 +270,7 @@ sub testFinalConfig($;$) {
#- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one
#- that way, you can talk to :9 without doing a chroot
symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix;
- restart_xfs;
+ #- restart_xfs;
my $f_err = "$prefix/tmp/Xoutput";
my $pid;
@@ -734,7 +730,7 @@ sub main {
my %c = my @c = (
__("Change Monitor") => sub { $o->{monitor} = monitorConfiguration() },
- __("Change Graphic card") => sub { $o->{card} = cardConfiguration('', 'noauto') },
+ __("Change Graphic card") => sub { $o->{card} = cardConfiguration('', 'noauto', $allowFB) },
__("Change Resolution") => sub { resolutionsConfiguration($o, noauto => 1) },
__("Automatical resolutions search") => sub {
delete $o->{card}{depth};