summaryrefslogtreecommitdiffstats
path: root/installsrv_wizard
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2005-04-07 12:21:24 +0000
committerAntoine Ginies <aginies@mandriva.com>2005-04-07 12:21:24 +0000
commit685e9042abc52abf01eaae2e60d355c934b3828a (patch)
treed4fbbb8bc6511cf99f5415fffb0539e1b8b387fc /installsrv_wizard
parent4884a9fb8e433440cd2fa98b147a5920ded0b44f (diff)
downloaddrakwizard-685e9042abc52abf01eaae2e60d355c934b3828a.tar
drakwizard-685e9042abc52abf01eaae2e60d355c934b3828a.tar.gz
drakwizard-685e9042abc52abf01eaae2e60d355c934b3828a.tar.bz2
drakwizard-685e9042abc52abf01eaae2e60d355c934b3828a.tar.xz
drakwizard-685e9042abc52abf01eaae2e60d355c934b3828a.zip
use cp_data instead of run_command
Diffstat (limited to 'installsrv_wizard')
-rw-r--r--installsrv_wizard/Installsrv.pm17
1 files changed, 10 insertions, 7 deletions
diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index 33e5ab71..a70a60db 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -92,10 +92,11 @@ $o->{pages} = {
{ label => "Destination directory:", fixed_val => \$o->{var}{DESTDIR} },
{ label => N("Enable NFS install server:"), fixed_val => \$o->{var}{nfs} },
{ label => N("Enable HTTP install server:"), fixed_val => \$o->{var}{http} },
- ],
- complete => \&do_it,
- next => 'wait',
- },
+ ],
+ post => \&do_it,
+ no_back => 1,
+ next => 'end',
+ },
wait => {
name => N("Configuring your system, please wait..."),
next => 'end',
@@ -145,15 +146,17 @@ sub cp_data {
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..."));
my $S = $o->{var}{SOURCEDIR};
my $D = $o->{var}{DESTDIR};
if (! -d $D) { mkdir_p($D) }
- run_command_and_log("cp -avf $S/* $D", "Copying data $S/* $D");
+ cp_data($o->{var}{SOURCEDIR}, $o->{var}{DESTDIR});
add_install_dir();
add_http_link($o->{var}{DESTDIR});
- return 0;
+ undef $w;
}
-
+
sub new {
my ($class) = @_;
bless {