now use a progress bar

1 files changed, 10 insertions, 10 deletions

diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index cbf0b5ae..8e7c1798 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -101,6 +101,13 @@ $o->{pages} = {
 			name => N("Configuring your system, please wait..."),
 			next => 'end',
 		       },
+	       error_end => {
+                             name => N("Failed"),
+                             data => [ { label => N("Please Relaunch drakwizard, and try to change some parameters.") } ],
+                             no_back => 1,
+                             end => 1,
+                             next => 0,
+                            },
 	       end => {
 		       name => N("Congratulations, Install server is now ready. You can now configure a DHCP server with PXE support, and a PXE server. So it will be very easy to install Linux through a network. Use drakpxelinux to configure your PXE server, and drakwizard DHCP to configure a DHCPD server."),
 		       end => 1,
@@ -138,23 +145,16 @@ sub add_http_link {
   check_started("httpd");
 }
 
-sub cp_data {
-  my ($SRCDIR, $DEST) = @_;
-  mkdir_p($DEST);
-  system("cp -av $SRCDIR/* $DEST");
-}
-
 sub do_it {
   return if $::testing;
-  my $in = 'interactive'->vnew('su', 'install');
-  my $w = $in->wait_message(N("Copying data"), N("Configuring your system as Linux install server via NFS or HTTP, this can take a while, so be patient please..."));
   my $S = $o->{var}{SOURCEDIR};
   my $D = $o->{var}{DESTDIR};
   if (! -d $D) { mkdir_p($D) }
-  cp_data($o->{var}{SOURCEDIR}, $o->{var}{DESTDIR});
+  my $command = "cp -av $S/* $D";
+  wizard_progress_bar($command, "Copying Data...");
+
   add_install_dir();
   add_http_link($o->{var}{DESTDIR});
-  undef $w;
 }
 
 sub new {