summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-17 00:39:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-17 00:39:01 +0000
commit11b0b944ddde76b4982fa2f9e2118dcee5035f80 (patch)
treea873f848dcf1eda96b89a0319f8923e10bbc5b4a /perl-install/install_steps_interactive.pm
parentd77799bb5ce63ecac4de72e1b27f56d7d22fd048 (diff)
downloaddrakx-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar
drakx-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar.gz
drakx-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar.bz2
drakx-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar.xz
drakx-11b0b944ddde76b4982fa2f9e2118dcee5035f80.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 18ad53a87..5664b4d0c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -14,6 +14,7 @@ use common qw(:common :file :functional :system);
use partition_table qw(:types);
use partition_table_raw;
use install_steps;
+use install_interactive;
use install_any;
use detect_devices;
use run_program;
@@ -22,6 +23,7 @@ use devices;
use fsedit;
use network;
use raid;
+use Netconnect;
use mouse;
use modules;
use lang;
@@ -214,7 +216,7 @@ sub ask_mntpoint_s {
#------------------------------------------------------------------------------
sub doPartitionDisks {
my ($o) = @_;
- my %solutions = install_any::partitionWizard($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly});
+ my %solutions = install_interactive::partitionWizard($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly});
my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions;
my $level = $::beginner ? 2 : -9999;
@@ -741,7 +743,7 @@ sub addUser {
$u->{password2} ||= $u->{password} ||= "";
$u->{shell} ||= "/bin/bash";
my @fields = qw(realname name password password2);
- my @shells = install_any::shells($o);
+ my @shells = map { chomp; $_ } cat_("$o->{prefix}/etc/shells");
if (($o->{security} >= 1 || $clicked)) {
$u->{icon} = translate($u->{icon});
@@ -755,7 +757,7 @@ sub addUser {
_("Password") => {val => \$u->{password}, hidden => 1},
_("Password (again)") => {val => \$u->{password2}, hidden => 1},
), $::beginner ? () : (
- _("Shell") => {val => \$u->{shell}, list => \@shells, not_edit => !$::expert}
+ _("Shell") => {val => \$u->{shell}, list => [ any::shells($o->{prefix}) ], not_edit => !$::expert}
), $o->{security} > 3 || $::beginner ? () : (
_("Icon") => {val => \$u->{icon}, list => [ map { translate($_) } @any::users ], not_edit => 1 },
),