diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-15 17:05:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-15 17:05:18 +0000 |
| commit | 582cc9a731459f6069e218f750eaa414ff587baf (patch) | |
| tree | 8e6745e7054e084b04414804a56e78de98228562 /perl-install/standalone/diskdrake | |
| parent | fe791a2b227213568a101d9aae4b78f606a27dcd (diff) | |
| download | drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar.gz drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar.bz2 drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar.xz drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.zip | |
fix XkbOptions handling
Diffstat (limited to 'perl-install/standalone/diskdrake')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index 01c0ed294..d97c333e1 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,14 +51,8 @@ if ($>) { } -#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) = +my $in = 'interactive'->vnew; #TODO('su'); +my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { my ($err) = $@ =~ /(.*) at /; @@ -69,10 +63,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_fstab(@$hds, @$lvms) ]; +my $fstab = [ fsedit::get_all_fstab($all_hds) ]; fs::get_mntpoints_from_fstab($fstab); fs::check_mounted($fstab); -diskdrake::main($hds, $lvms, {}, $in); +$in->diskdrake::main($all_hds); $in->exit(0); |