summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorMystery Man <unknown@mandriva.org>2005-10-20 14:05:54 +0000
committerMystery Man <unknown@mandriva.org>2005-10-20 14:05:54 +0000
commit9b6a0d83d135fad376b4eadcb2bd7bd8c8a07aa5 (patch)
treef3ef7ada2ce82dafb6d41cc087b0cc7fdfc40a46 /perl-install/install2.pm
parent3e4ad5e1b687f262a1d7cc39a0b905a595ac7f95 (diff)
downloaddrakx-backup-do-not-use-10_34_11_100mdk.tar
drakx-backup-do-not-use-10_34_11_100mdk.tar.gz
drakx-backup-do-not-use-10_34_11_100mdk.tar.bz2
drakx-backup-do-not-use-10_34_11_100mdk.tar.xz
drakx-backup-do-not-use-10_34_11_100mdk.zip
This commit was manufactured by cvs2svn to create tagV10_34_11_100mdk
'V10_34_11_100mdk'.
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c1a47d33d..6fea37b19 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -206,7 +206,7 @@ sub formatPartitions {
#- needed by lilo
if (my @vgs = map { $_->{VG_name} } @{$o->{all_hds}{lvms}}) {
- cp_af("/dev/$_", "$::prefix/dev") foreach 'mapper', @vgs;
+ common::my_cp_af("/dev/$_", "$::prefix/dev") foreach 'mapper', @vgs;
}
}
@@ -264,7 +264,7 @@ sub configureNetwork {
#------------------------------------------------------------------------------
sub installUpdates {
my ($_clicked, $_ent_number, $auto) = @_;
- installStepsCall($o, $auto, 'installUpdates');
+ installStepsCall($o, $auto, 'installUpdates') if $o->{meta_class} ne 'firewall';
}
#------------------------------------------------------------------------------
sub configureServices {
@@ -384,6 +384,7 @@ sub main {
step => sub { $o->{steps}{first} = $v },
expert => sub { $::expert = $v },
meta_class => sub { $o->{meta_class} = $v },
+ freedriver => sub { $o->{freedriver} = $v },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },
askdisplay => sub { print "Please enter the X11 display to perform the install on ? "; $o->{display} = chomp_(scalar(<STDIN>)) },
@@ -411,6 +412,7 @@ sub main {
nomouseprobe => sub { $o->{nomouseprobe} = $v },
updatemodules => sub { $o->{updatemodules} = 1 },
move => sub { $::move = 1 },
+ globetrotter => sub { $::move = 1; $::globetrotter = 1 },
}}{lc $n}; &$f if $f;
} %cmdline;