summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-19 17:31:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-19 17:31:21 +0000
commit190150fae69cd0b7839b7f36c8139fff9079bb7f (patch)
treed86bdbe017c049bdb81452a67a5e7d915b46fdc0 /perl-install/install_steps_interactive.pm
parent25a532696b1a761d02d03bdbe7076258ca370fd3 (diff)
downloaddrakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar.gz
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar.bz2
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar.xz
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 64cfa1ea9..b2da1209f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -245,7 +245,7 @@ Continue at your own risk!"));
if ($o->{isUpgrade}) {
# either one root is defined (and all is ok), or we take the first one we find
my $p =
- fsedit::get_root($o->{fstab}) ||
+ fsedit::get_root_($o->{fstab}) ||
$o->ask_from_listf(_("Root Partition"),
_("What is the root partition (/) of your system?"),
\&partition_table_raw::description,
@@ -372,7 +372,7 @@ sub choosePackages {
}
});
if (!$size2install) { #- special case for desktop
- $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual);
+ $o->chooseGroups($packages, $compssUsers, $compssUsersSorted);
}
($o->{packages_}{ind}) =
pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass});
@@ -394,8 +394,8 @@ sub chooseGroups {
_("Package Group Selection"),
[ @$compssUsersSorted, _("Miscellaneous") ],
[ map { \$o->{compssUsersChoice}{$_} } @$compssUsersSorted, "Miscellaneous" ],
- [ _("Individual package selection") ], [ $individual ],
- ) or goto &chooseGroups;
+ $individual ? ([ _("Individual package selection") ], [ $individual ]) : (),
+ ) or goto &chooseGroups;
unless ($o->{compssUsersChoice}{Miscellaneous}) {
my %l;