diff options
author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-19 17:31:42 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-19 17:31:42 +0000 |
commit | 25f65beed0677fa247c513705dbf538225f979c4 (patch) | |
tree | e0ec937937cba2d6279e97b3b7036fe0856d5bb2 /perl-install/install_steps.pm | |
parent | a0b5f74447cc699c43c354cb6397ed554605729b (diff) | |
download | drakx-25f65beed0677fa247c513705dbf538225f979c4.tar drakx-25f65beed0677fa247c513705dbf538225f979c4.tar.gz drakx-25f65beed0677fa247c513705dbf538225f979c4.tar.bz2 drakx-25f65beed0677fa247c513705dbf538225f979c4.tar.xz drakx-25f65beed0677fa247c513705dbf538225f979c4.zip |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r-- | perl-install/install_steps.pm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 181c37099..c298c2c9f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -29,7 +29,7 @@ use fs; #-###################################################################################### sub new($$) { my ($type, $o) = @_; - + bless $o, ref $type || $type; return $o; } @@ -51,7 +51,7 @@ sub enteringStep($$) { my @l = ref $needs ? @$needs : $needs; $reachable = min(map { $o->{steps}{$_}{done} || 0 } @l); } - $o->{steps}{$s}{reachable} = 1 if $reachable; + $o->{steps}{$s}{reachable} = 1 if $reachable; } } sub leavingStep($$) { @@ -62,7 +62,7 @@ sub leavingStep($$) { while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) { eval { &$f() }; - $o->ask_warn(_("Error"), [ + $o->ask_warn(_("Error"), [ _("An error occurred, i don't know how to handle it nicely, so continue at your own risk :("), $@ ]) if $@; } @@ -86,9 +86,9 @@ sub selectLanguage { } } #------------------------------------------------------------------------------ -sub selectKeyboard { +sub selectKeyboard { my ($o) = @_; - keyboard::setup($o->{keyboard}) + keyboard::setup($o->{keyboard}) } #------------------------------------------------------------------------------ sub selectPath {} @@ -113,7 +113,7 @@ sub rebootNeeded($) { sub choosePartitionsToFormat($$) { my ($o, $fstab) = @_; - foreach (@$fstab) { + foreach (@$fstab) { $_->{toFormat} = ($_->{mntpoint} && isExt2($_) || isSwap($_)) && ($_->{notFormatted} || $o->{partitioning}{autoformat}); } @@ -158,7 +158,7 @@ sub afterInstallPackages($) { } #------------------------------------------------------------------------------ -sub selectMouse($) { +sub selectMouse($) { my ($o) = @_; } @@ -173,7 +173,7 @@ sub configureNetwork($) { network::add2hosts("$etc/hosts", $o->{netc}{HOSTNAME}, map { $_->{IPADDR} } @{$o->{intf}}); network::sethostname($o->{netc}) unless $::testing; network::addDefaultRoute($o->{netc}) unless $::testing; - #-res_init(); #- reinit the resolver so DNS changes take affect + #-res_init(); #- reinit the resolver so DNS changes take affect } #------------------------------------------------------------------------------ @@ -182,7 +182,7 @@ sub pcmciaConfig($) { my $t = $o->{pcmcia}; my $f = "$o->{prefix}/etc/sysconfig/pcmcia"; - # should be set after installing the package above else the file will be renamed. + #- should be set after installing the package above else the file will be renamed. setVarsInSh($f, { PCMCIA => $t ? "yes" : "no", PCIC => $t, @@ -278,7 +278,7 @@ sub createBootdisk($) { my @l = detect_devices::floppies(); - $dev = shift @l || die _("no floppy available") + $dev = shift @l || die _("no floppy available") if $dev eq "1"; #- special case meaning autochoose return if $::testing; |