diff options
Diffstat (limited to 'perl-install/install/steps_auto_install.pm')
| -rw-r--r-- | perl-install/install/steps_auto_install.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install/steps_auto_install.pm b/perl-install/install/steps_auto_install.pm index f6b556a9d..ceaab7ed3 100644 --- a/perl-install/install/steps_auto_install.pm +++ b/perl-install/install/steps_auto_install.pm @@ -1,4 +1,4 @@ -package install::steps_auto_install; # $Id$ +package install::steps_auto_install; use diagnostics; use strict; @@ -11,13 +11,13 @@ use vars qw(@ISA $graphical @graphical_steps); #-###################################################################################### use common; use install::steps; -use install::steps_gtk; sub new { my ($type, $o) = @_; - # Handle legacy options $o->{interactive} ||= 'gtk' if $graphical || !is_empty_array_ref($o->{interactiveSteps}); + # Handle legacy options + push @{$o->{interactiveSteps}}, qw(setRootPassword_addUser) if intersection($o->{interactiveSteps}, ['addUser', 'setRootPassword']); push @{$o->{interactiveSteps}}, qw(installPackages configureNetwork), @graphical_steps, if_(!$o->{autoExitInstall}, 'exitInstall'); if ($o->{interactive}) { @@ -131,8 +131,8 @@ sub errorInStep { #- Steps Functions #-###################################################################################### sub installPackages { - my ($o, $packages) = @_; - catch_cdie { $o->install::steps::installPackages($packages) } sub { print formatError($@), "\n"; 1 }; + my ($o) = @_; + catch_cdie { $o->install::steps::installPackages } sub { print formatError($@), "\n"; 1 }; } 1; |
