summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-07-11 16:49:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-07-11 16:49:21 +0000
commit4c2fb3914a389afd7a79bbabea1dde6968448505 (patch)
tree6a8bce94bd86081a8ea16575ac04aa8497165731 /perl-install/install2.pm
parent7bde119e6549da24984faa80c892e2f028e10d4f (diff)
downloaddrakx-4c2fb3914a389afd7a79bbabea1dde6968448505.tar
drakx-4c2fb3914a389afd7a79bbabea1dde6968448505.tar.gz
drakx-4c2fb3914a389afd7a79bbabea1dde6968448505.tar.bz2
drakx-4c2fb3914a389afd7a79bbabea1dde6968448505.tar.xz
drakx-4c2fb3914a389afd7a79bbabea1dde6968448505.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index b692650f0..17e20c5fc 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -224,6 +224,8 @@ $o = $::o = {
};
+$::oo = {};
+
#-######################################################################################
#- Steps Functions
#- each step function are called with two arguments : clicked(because if you are a
@@ -232,7 +234,7 @@ $o = $::o = {
#------------------------------------------------------------------------------
sub selectLanguage {
- $o->selectLanguage($_[1] == 1);
+ $o->selectLanguage;
addToBeDone {
lang::write($o->{prefix});
@@ -299,7 +301,7 @@ sub partitionDisks {
return install_any::searchAndMount4Upgrade($o) if $o->{isUpgrade};
my $stage1_hd;
- if (cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage\s+(\S+)|) {
+ if (cat_("/proc/mounts") =~ m|/\w+/(\S+)\s+/tmp/hdimage\s+(\S+)|) {
$stage1_hd = { dev => $1, fs => $2 };
install_any::getFile("XXX"); #- close still opened filehandle
fs::umount("/tmp/hdimage");
@@ -557,6 +559,9 @@ sub main {
map_each {
my ($n, $v) = @_;
my $f = ${{
+ oem => sub { $::oo->{oem} = $v },
+ lang => sub { $o->{lang} = $v },
+ flang => sub { $o->{lang} = $::oo->{lang} = $v },
method => sub { $o->{method} = $v },
pcmcia => sub { $o->{pcmcia} = $v },
vga16 => sub { $o->{vga16} = $v },
@@ -564,6 +569,7 @@ sub main {
expert => sub { $::expert = 1; $::beginner = 0 },
beginner => sub { $::beginner = $v },
class => sub { $o->{installClass} = $v },
+ fclass => sub { $o->{installClass} = $::oo->{installClass} = $v },
lnx4win => sub { $o->{lnx4win} = 1 },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },