diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-10 13:38:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-10 13:38:50 +0000 |
| commit | 2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1 (patch) | |
| tree | 01de6b030ad01e8f7ad728ce01742317a6963207 /perl-install/install_steps.pm | |
| parent | a864aa06bfc1fe86c37633158926f287110af834 (diff) | |
| download | drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar.gz drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar.bz2 drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar.xz drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.zip | |
simplify and factorize
(now works on 1.upgrade 2.install 3.install + change existing config)
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index eb51551b2..5d7314166 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -898,9 +898,6 @@ sub setupBootloader { sub configureXBefore { my ($o) = @_; - require Xconfig::default; - $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse}); - #- keep this here if the package has to be updated. $o->pkg_install("XFree86"); } @@ -908,6 +905,9 @@ sub configureX { my ($o) = @_; configureXBefore($o); + require Xconfig::default; + $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse}); + require Xconfig::main; Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X}, { allowFB => $o->{allowFB}, |