summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/XFdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-31 22:32:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-31 22:32:10 +0000
commit2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d (patch)
tree9fb1eefecfd5f9940fb7d5bf92fe99f4f3f528d3 /perl-install/standalone/XFdrake
parent157a01642c2a988c3308d7d3dd0f8ba36a0cf641 (diff)
downloaddrakx-2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d.tar
drakx-2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d.tar.gz
drakx-2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d.tar.bz2
drakx-2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d.tar.xz
drakx-2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d.zip
- add non-wizard ability to XFdrake
- first part of ATI TVout support (still needs patching initscript, and adding an entry in bootloader) (and testing of course :)
Diffstat (limited to 'perl-install/standalone/XFdrake')
-rwxr-xr-xperl-install/standalone/XFdrake15
1 files changed, 13 insertions, 2 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 5153b54b9..f547c722a 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -25,6 +25,7 @@ use Xconfig::main;
use Xconfig::xfree;
use Xconfig::default;
use interactive;
+use common;
use any;
use c;
@@ -58,11 +59,15 @@ begin:
if ($configure_this eq 'everything') {
check_XFree($in);
my $raw_X = Xconfig::xfree->read;
+ my $default = Xconfig::default::configure();
+ my $has_conf = @{$raw_X->{xfree3}} || @{$raw_X->{xfree4}};
+ $raw_X->{xfree3} = $default->{xfree3} if !@{$raw_X->{xfree3}};
+ $raw_X->{xfree4} = $default->{xfree4} if !@{$raw_X->{xfree4}};
- if (@{$raw_X->{xfree3}} || @{$raw_X->{xfree4}}) {
+ if ($has_conf) {
Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
} else {
- Xconfig::main::configure_everything($in, Xconfig::default::configure(), $in->do_pkgs, $auto, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
+ Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
}
} elsif ($configure_this eq 'auto_install') {
Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
@@ -83,6 +88,12 @@ begin:
sub check_XFree {
my ($in) = @_;
+ #- set the standard configuration
+ foreach ('XF86Config', 'XF86Config-4') {
+ my $f = "/etc/X11/$_";
+ symlinkf("$_.standard", $f) if -l $f && -e "$f.standard";
+ }
+
my $f = "/usr/X11R6/lib/X11/rgb.txt"; #- this one is on all platform
-e $f or $in->do_pkgs->install('XFree86', 'XFree86-75dpi-fonts');
-e $f or die "install XFree86 first!\n";