From 2c1805a3ed18ffc39059f3ba6b391b417b80b5ac Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 19 Mar 2008 23:04:51 +0000
Subject: add more wait messages

---
 draklive-install | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'draklive-install')

diff --git a/draklive-install b/draklive-install
index ec002a7..835cb6a 100755
--- a/draklive-install
+++ b/draklive-install
@@ -53,6 +53,7 @@ sub on_reboot_needed {
 
 my $in = 'interactive'->vnew('su');
 $in->{pop_wait_messages} = 0;
+my $wait;
 
 require any;
 my $has_running_wm = to_bool(any::running_window_manager());
@@ -72,6 +73,7 @@ my $title = N("Mandriva Live");
     $w->main;
 }
 
+$wait = $in->wait_message('', N("Please wait"));
 my $all_hds = fsedit::get_hds();
 fs::get_raw_hds('', $all_hds);
 fs::get_info_from_fstab($all_hds);
@@ -86,6 +88,7 @@ fs::any::get_hds($all_hds, $fstab, [], {}, 'skip_mtab', $in);
 
 umount_all($fstab);
 
+undef $wait;
 fs::partitioning_wizard::main($in, $all_hds, $fstab, [], undef, {}, 'skip_mtab');
 
 mkdir_p($::prefix) or die "unable to create $::prefix";
@@ -97,11 +100,13 @@ umount_all($fstab);
 fs::partitioning::format_mount_partitions($in, $all_hds, $fstab);
 
 #- create required directories and devices (early to have a consistent root before calling other programs)
+$wait = $in->wait_message('', N("Please wait"));
 fs::any::prepare_minimal_root($all_hds);
 run_program::run('makedev', $::prefix . '/dev');
+undef $wait;
 
 #- copy to disk
-my $wait = $in->wait_message('', N("Computing total size"));
+$wait = $in->wait_message('', N("Computing total size"));
 my $total = first(split(/\s+/, `du -sbx / 2>/dev/null`));
 undef $wait;
 
@@ -131,6 +136,8 @@ open(my $OUTPUT, '-|', build_copy_command('/', $::prefix));
 undef $update_progress;
 undef $wait;
 
+$wait = $in->wait_message('', N("Please wait"));
+
 my $real_rpm_dir = "/tmp/rpm/real";
 cp_f(glob($real_rpm_dir . "/*"), $::prefix . "/var/lib/rpm") if -d $real_rpm_dir;
 
@@ -175,6 +182,7 @@ if ($harddrake_conf) {
 require services;
 services::start_service_on_boot($_) foreach qw(dkms crond);
 
+undef $wait;
 use bootloader;
 my $bootloader = {};
 any::setupBootloaderBeforeStandalone($in->do_pkgs, $bootloader, $all_hds, $fstab);
-- 
cgit v1.2.1