From 95887b5a65aa7ebaf62b7ab663e085be0f154f39 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 13 Aug 2007 20:14:13 +0000 Subject: - adduserdrake, finish-install: o create only one user o fix checking user info (#32517) - install: o merge root password step and create user step (new setRootPassword_addUser step name, but still handle addUser setRootPassword in interactiveSteps for auto_installs) o fix checking user creation info (#32517) o allow to create only one user per default, but add an entry in summary to create more users o authentication method is not configurable anymore for now. should we add it to summary? --- perl-install/install/install2.pm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'perl-install/install/install2.pm') diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 8532a02c5..8addfdb33 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -271,17 +271,10 @@ sub configureServices { installStepsCall($o, $auto, 'configureServices'); } #------------------------------------------------------------------------------ -sub setRootPassword { +sub setRootPassword_addUser { my ($auto) = @_; - return if $o->{isUpgrade}; - installStepsCall($o, $auto, 'setRootPassword'); -} -#------------------------------------------------------------------------------ -sub addUser { - my ($auto) = @_; - - installStepsCall($o, $auto, 'addUser') if !$o->{isUpgrade}; + installStepsCall($o, $auto, 'setRootPassword_addUser') if !$o->{isUpgrade}; } #------------------------------------------------------------------------------ -- cgit v1.2.1