summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-06 00:38:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-06 00:38:57 +0000
commitc75193289b79d4c0687aa6a597b51436568f8360 (patch)
tree0dde0958b1d48a729e30be420f9f8c94004b7ef8 /perl-install/install_steps.pm
parentc5d30320d3d120ccd291ccc7b7271400a4f20e4a (diff)
downloaddrakx-backup-do-not-use-c75193289b79d4c0687aa6a597b51436568f8360.tar
drakx-backup-do-not-use-c75193289b79d4c0687aa6a597b51436568f8360.tar.gz
drakx-backup-do-not-use-c75193289b79d4c0687aa6a597b51436568f8360.tar.bz2
drakx-backup-do-not-use-c75193289b79d4c0687aa6a597b51436568f8360.tar.xz
drakx-backup-do-not-use-c75193289b79d4c0687aa6a597b51436568f8360.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8df7f94b5..9b3b9b8db 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -129,7 +129,7 @@ sub doPartitionDisks {
if ($o->{lnx4win}) {
my @l = sort { $a->{device_windobe} cmp $b->{device_windobe} }
grep { isFat($_) } fsedit::get_fstab(@{$o->{hds}}) or die "wow, lnx4win with no fat partitions! hard times :(";
- my $real_part = @l > 1 && $o->doPartitionDisksLnx4winDev(\@l) || $l[0];
+ my $real_part = $o->doPartitionDisksLnx4winDev(\@l) || $l[0];
my $handle = loopback::inspect($real_part, '', 'rw') or die _("This partition can't be used for loopback");
my $size = loopback::getFree($handle->{dir}, $real_part);
@@ -631,20 +631,20 @@ sub pcmciaConfig($) {
}
#------------------------------------------------------------------------------
-sub timeConfig {
+sub configureTimezone {
my ($o, $f) = @_;
require timezone;
timezone::write($o->{prefix}, $o->{timezone}, $f);
}
#------------------------------------------------------------------------------
-sub servicesConfig {
+sub configureServices {
my ($o) = @_;
require services;
services::doit($o, $o->{services}, $o->{prefix}) if $o->{services};
}
#------------------------------------------------------------------------------
-sub printerConfig {
+sub configurePrinter {
my($o) = @_;
if ($o->{printer}{configured}) {
require pkgs;
@@ -834,7 +834,7 @@ sub setupBootloader($) {
}
#------------------------------------------------------------------------------
-sub setupXfreeBefore {
+sub configureXBefore {
my ($o) = @_;
my $xkb = $o->{X}{keyboard}{xkb_keymap} || keyboard::keyboard2xkb($o->{keyboard});
if (!-e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb" && (my $f = keyboard::xmodmap_file($o->{keyboard}))) {
@@ -851,9 +851,9 @@ sub setupXfreeBefore {
#- keep this here if the package has to be updated.
$o->pkg_install("XFree86");
}
-sub setupXfree {
+sub configureX {
my ($o) = @_;
- $o->setupXfreeBefore;
+ $o->configureXBefore;
require Xconfigurator;
require class_discard;
@@ -864,9 +864,9 @@ sub setupXfree {
$o->pkg_install("XFree86-$_[0]");
});
}
- $o->setupXfreeAfter;
+ $o->configureXAfter;
}
-sub setupXfreeAfter {
+sub configureXAfter {
my ($o) = @_;
if ($o->{X}{card}{server} eq 'FBDev') {
unless (install_any::setupFB($o, Xconfigurator::getVGAMode($o->{X}))) {