From f229f16ba82f98de5d54a8ec71c8a63476dae8c6 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 19 Mar 2008 22:47:30 +0000 Subject: detect disks later to make startup faster --- draklive-install | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'draklive-install') diff --git a/draklive-install b/draklive-install index 846f2f5..ec002a7 100755 --- a/draklive-install +++ b/draklive-install @@ -54,24 +54,8 @@ sub on_reboot_needed { my $in = 'interactive'->vnew('su'); $in->{pop_wait_messages} = 0; -my $all_hds = fsedit::get_hds(); -fs::get_raw_hds('', $all_hds); -fs::get_info_from_fstab($all_hds); -my $fstab = [ fs::get::fstab($all_hds) ]; -fs::merge_info_from_mtab($fstab); -eval { fs::mount::umount_all($fstab) }; - -$::prefix = '/mnt/install'; -$all_hds = {}; -$fstab = []; -fs::any::get_hds($all_hds, $fstab, [], {}, 'skip_mtab', $in); - -umount_all($fstab); - require any; my $has_running_wm = to_bool(any::running_window_manager()); - - $::isWizard = 1; $::Wizard_no_previous = 1; $::Wizard_pix_up = "MandrivaOne-install-icon"; @@ -88,6 +72,20 @@ my $title = N("Mandriva Live"); $w->main; } +my $all_hds = fsedit::get_hds(); +fs::get_raw_hds('', $all_hds); +fs::get_info_from_fstab($all_hds); +my $fstab = [ fs::get::fstab($all_hds) ]; +fs::merge_info_from_mtab($fstab); +eval { fs::mount::umount_all($fstab) }; + +$::prefix = '/mnt/install'; +$all_hds = {}; +$fstab = []; +fs::any::get_hds($all_hds, $fstab, [], {}, 'skip_mtab', $in); + +umount_all($fstab); + fs::partitioning_wizard::main($in, $all_hds, $fstab, [], undef, {}, 'skip_mtab'); mkdir_p($::prefix) or die "unable to create $::prefix"; -- cgit v1.2.1