diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-03-22 16:23:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-03-22 16:23:18 +0000 |
| commit | bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd (patch) | |
| tree | 09cc46da57fd664f6e3b9564875f8afdc46e984d | |
| parent | 254d39c735ccd72b687305704079a4c8e7f1d86e (diff) | |
| download | drakx-backup-do-not-use-bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd.tar drakx-backup-do-not-use-bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd.tar.gz drakx-backup-do-not-use-bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd.tar.bz2 drakx-backup-do-not-use-bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd.tar.xz drakx-backup-do-not-use-bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd.zip | |
put X conf read in Xconfig::main
| -rw-r--r-- | perl-install/Xconfig/main.pm | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/XFdrake | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm index eb0d1d22b..3b1189e79 100644 --- a/perl-install/Xconfig/main.pm +++ b/perl-install/Xconfig/main.pm @@ -14,8 +14,9 @@ use any; sub configure_monitor { - my ($in, $raw_X) = @_; + my ($in) = @_; + my $raw_X = Xconfig::xfree->read; my $before = $raw_X->prepare_write; Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices)) or return; if ($raw_X->prepare_write ne $before) { @@ -27,8 +28,9 @@ sub configure_monitor { } sub configure_resolution { - my ($in, $raw_X) = @_; + my ($in) = @_; + my $raw_X = Xconfig::xfree->read; my $X = { card => Xconfig::card::from_raw_X($raw_X), monitors => [ $raw_X->get_monitors ], diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 47f138e47..65079bd7c 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -49,9 +49,9 @@ $configure_this ||= $::auto ? 'auto_install' : 'everything'; } elsif ($configure_this eq 'auto_install') { Xconfig::main::configure_everything_auto_install(Xconfig::default::configure($in->do_pkgs), $in->do_pkgs, {}, $options); } elsif ($configure_this eq 'monitor') { - Xconfig::main::configure_monitor($in, Xconfig::xfree->read); + Xconfig::main::configure_monitor($in); } elsif ($configure_this eq 'resolution') { - Xconfig::main::configure_resolution($in, Xconfig::xfree->read); + Xconfig::main::configure_resolution($in); } }; if (!$::auto) { |