From 5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 13 Sep 2000 13:30:37 +0000
Subject: no_comment

---
 perl-install/install_interactive.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'perl-install/install_interactive.pm')

diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 641d9ad59..e51fa5a8b 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -6,15 +6,14 @@ use strict;
 use vars;
 
 use common qw(:common :functional);
-use fs;
-use fsedit;
-use log;
 use partition_table qw(:types);
 use partition_table_raw;
 use detect_devices;
 use install_steps;
 use devices;
-use modules;
+use fsedit;
+use log;
+use fs;
 
 
 sub tellAboutProprietaryModules {
@@ -30,6 +29,7 @@ sub partition_with_diskdrake {
     my $ok; 
     do {
 	$ok = 1;
+	require diskdrake;
 	diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}, $nowizard);
 	delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake');
 	my @fstab = fsedit::get_fstab(@$hds);
@@ -154,7 +154,6 @@ When sure, press Ok.")) or return;
     }
 
     if (!$readonly && ref($o) =~ /gtk/) { #- diskdrake only available in gtk for now
-	require diskdrake;
 	$solutions{diskdrake} = [ 0, ($::beginner ? _("Expert mode") : _("Use diskdrake")), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ];
     }
 
-- 
cgit v1.2.1