diff options
Diffstat (limited to 'perl-install/standalone/XFdrake')
| -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') { |