summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-28 22:00:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-28 22:00:14 +0000
commit70fd8ae05409bb33818da725015daf181c6e6a83 (patch)
treed4d9fb6febfb8e7f4969a4378b1918c66dc85acb /perl-install
parentcc861e1aba622e8c1daad04fe9be3ed1f8076a16 (diff)
downloaddrakx-70fd8ae05409bb33818da725015daf181c6e6a83.tar
drakx-70fd8ae05409bb33818da725015daf181c6e6a83.tar.gz
drakx-70fd8ae05409bb33818da725015daf181c6e6a83.tar.bz2
drakx-70fd8ae05409bb33818da725015daf181c6e6a83.tar.xz
drakx-70fd8ae05409bb33818da725015daf181c6e6a83.zip
adapt to new Xconfig modules
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_gtk.pm6
-rw-r--r--perl-install/install_steps_gtk.pm8
-rw-r--r--perl-install/standalone.pm2
3 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 0c895eda1..74ac6459c 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -221,9 +221,9 @@ sub createXconf {
symlink("/tmp/stage2/etc/im_palette.pal", "etc/im_palette.pal");
if (arch() =~ /^ia64/) {
- require Xconfigurator;
- my ($card) = Xconfigurator::probe_cards();
- Xconfigurator::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type};
+ require Xconfig::card;
+ my ($card) = Xconfig::card::probe();
+ Xconfig::card::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type};
output($file, <<END);
Section "Files"
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index c2ec797cd..1ad27b7fe 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -36,7 +36,7 @@ sub new($$) {
unless ($::testing) {
if ($ENV{DISPLAY} eq ":0" && !$::live) {
my $f = "/tmp/Xconf";
- install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{wacom}[0]);
+ install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0]);
devices::make("/dev/kbd");
local (*T1, *T2);
@@ -67,9 +67,9 @@ sub new($$) {
};
my @servers = qw(FBDev VGA16); #-)
if (arch() eq "alpha") {
- require Xconfigurator;
- my ($card) = Xconfigurator::probe_cards();
- Xconfigurator::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type};
+ require Xconfig::card;
+ my ($card) = Xconfig::card::probe();
+ Xconfig::card::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type};
@servers = $card->{server} || "TGA";
#-@servers = qw(SVGA 3DLabs TGA)
} elsif (arch() =~ /^sparc/) {
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 7d405ce5a..e001f6d2c 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -69,7 +69,7 @@ sub explanations { c::syslog(c::LOG_INFO()|c::LOG_LOCAL1(), "@_") }
@common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setVarsInCsh update_gnomekderc);
@builtin_functs = qw(chmod chown unlink link symlink rename system);
-@drakx_modules = qw(Xconfig Xconfigurator Xconfigurator_consts any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone tinyfirewall);
+@drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree Xconfig::xfree3 Xconfig::xfree4 Xconfig::xfreeX any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone tinyfirewall);
sub import {