diff options
Diffstat (limited to 'perl-install/install_steps_auto_install.pm')
-rw-r--r-- | perl-install/install_steps_auto_install.pm | 49 |
1 files changed, 4 insertions, 45 deletions
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm index 19a4358d9..254f092ff 100644 --- a/perl-install/install_steps_auto_install.pm +++ b/perl-install/install_steps_auto_install.pm @@ -6,9 +6,6 @@ use vars qw(@ISA); @ISA = qw(install_steps); -use modules; - - #-###################################################################################### #- misc imports #-###################################################################################### @@ -16,60 +13,22 @@ use common qw(:common); use install_steps; use log; -my $graphical = 1; - -sub new { - my ($type, $o) = @_; - - if ($graphical) { - require install_steps_gtk; - undef *enteringStep; *enteringStep = \&install_steps_gtk::enteringStep; - undef *installPackages; *installPackages = \&install_steps_gtk::installPackages; - goto &install_steps_gtk::new; - } else { - (bless {}, ref $type || $type)->SUPER::new($o); - } -} - -sub configureNetwork { - my ($o) = @_; - modules::load_thiskind('net', sub {}, $o->{pcmcia}); - install_steps::configureNetwork($o); -} - sub enteringStep($$$) { my ($o, $step) = @_; - print _("Entering step `%s'\n", translate($o->{steps}{$step}{text})); + print _("Entering step `%s'\n", $o->{steps}{$step}{text}); $o->SUPER::enteringStep($step); } sub ask_warn { log::l(ref $_[1] ? join " ", @{$_[1]} : $_[1]); } -sub wait_message {} -sub errorInStep { +sub errorInStep { print "error :(\n"; print "switch to console f2 for a shell\n"; - print "Press <Enter> to reboot\n"; + print "press to return to reboot\n"; <STDIN>; - c::_exit(0); -} - -sub exitInstall { - my ($o, $alldone) = @_; - return if $o->{autoExitInstall}; - - if ($graphical) { - my $O = bless $o, "install_steps_gtk"; - $O->exitInstall($alldone); - } else { - install_steps::exitInstall; - print "\a"; - print "Auto installation complete\n"; - print "Press <Enter> to reboot\n"; - <STDIN>; - } + exec "true"; } 1; |