oops reverting modifs commited by error

1 files changed, 11 insertions, 5 deletions

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index d97c333e1..01c0ed294 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -22,7 +22,7 @@
 # DiskDrake is also based upon the libfdisk and the install from Red Hat Software
 
 
-use lib qw(. /usr/lib/libDrakX);
+use lib qw(/usr/lib/libDrakX);
 use common;
 use diskdrake;
 use standalone;
@@ -51,8 +51,14 @@ if ($>) {
 }
 
 
-my $in = 'interactive'->vnew; #TODO('su');
-my ($all_hds) =
+#if ($ARGV[0] eq '-l') {
+#    $@ and print "Error\n";
+#    $::expert = 1;
+#    print diskdrake::get_info($_, $hds->[0]) foreach fsedit::get_fstab($hds->[0]);
+#    exit !$@;
+#}
+my $in = interactive_gtk->new;
+my ($hds, $lvms) =
     catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) }
     sub {
 	my ($err) = $@ =~ /(.*) at /;
@@ -63,10 +69,10 @@ I'll try to go on blanking bad partitions"), $err]);
     };
 
 $SIG{__DIE__} = sub { my $m = chomp_($_[0]); log::l("ERROR: $m") };
-my $fstab = [ fsedit::get_all_fstab($all_hds) ];
+my $fstab = [ fsedit::get_fstab(@$hds, @$lvms) ];
  
 fs::get_mntpoints_from_fstab($fstab);
 fs::check_mounted($fstab);
-$in->diskdrake::main($all_hds);
+diskdrake::main($hds, $lvms, {}, $in);
 
 $in->exit(0);