diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-09-05 15:05:25 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-09-05 15:05:25 +0000 |
| commit | 84a3d6fbc48cd80e88ee2dd45eb0a2052691ac72 (patch) | |
| tree | 4ff3f9e2d789567f2c75456ea6407a9eafac9893 | |
| parent | f0eba89d8d6862087755141ac37bbb3bf9d3a714 (diff) | |
| download | drakx-backup-do-not-use-84a3d6fbc48cd80e88ee2dd45eb0a2052691ac72.tar drakx-backup-do-not-use-84a3d6fbc48cd80e88ee2dd45eb0a2052691ac72.tar.gz drakx-backup-do-not-use-84a3d6fbc48cd80e88ee2dd45eb0a2052691ac72.tar.bz2 drakx-backup-do-not-use-84a3d6fbc48cd80e88ee2dd45eb0a2052691ac72.tar.xz drakx-backup-do-not-use-84a3d6fbc48cd80e88ee2dd45eb0a2052691ac72.zip | |
correctly set allowFB flag
| -rwxr-xr-x | perl-install/standalone/XFdrake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index c02a003e2..2a58910f1 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -53,7 +53,9 @@ begin: $::isEmbedded and kill 'USR2', $::CCPID; - my $rc = do { + my $rc = do { + my $options = { allowNVIDIA_rpms => allowNVIDIA_rpms(), allowFB => listlength(cat_("/proc/fb")) }; + if ($configure_this eq 'everything') { check_XFree($in); my $raw_X = Xconfig::xfree->read; @@ -63,12 +65,12 @@ begin: $raw_X->{xfree4} = $default->{xfree4} if !@{$raw_X->{xfree4}}; if ($has_conf) { - Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, { allowNVIDIA_rpms => allowNVIDIA_rpms() }); + Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options); } else { - Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, { allowNVIDIA_rpms => allowNVIDIA_rpms() }); + Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options); } } elsif ($configure_this eq 'auto_install') { - Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, { allowNVIDIA_rpms => allowNVIDIA_rpms() }); + Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, $options); } elsif ($configure_this eq 'monitor') { Xconfig::main::configure_monitor($in, Xconfig::xfree->read); } elsif ($configure_this eq 'resolution') { |