From 27b57fc70ecd1d4276fa07442f3d5a41c0907ebd Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sun, 6 Mar 2005 13:24:32 +0000 Subject: ensure ntfsresize is available --- perl-install/diskdrake/interactive.pm | 1 + perl-install/diskdrake/resize_ntfs.pm | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index bd2e34cb4..a0602bbb3 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -713,6 +713,7 @@ sub Resize { } elsif ($part->{fs_type} eq 'ntfs') { write_partitions($in, $hd) or return; require diskdrake::resize_ntfs; + diskdrake::resize_ntfs::check_prog($in) or return; $nice_resize{ntfs} = diskdrake::resize_ntfs->new($part->{device}, devices::make($part->{device})); $min = $nice_resize{ntfs}->min_size or delete $nice_resize{ntfs}; } elsif ($part->{fs_type} eq 'reiserfs') { diff --git a/perl-install/diskdrake/resize_ntfs.pm b/perl-install/diskdrake/resize_ntfs.pm index aa838ea31..5af20f273 100644 --- a/perl-install/diskdrake/resize_ntfs.pm +++ b/perl-install/diskdrake/resize_ntfs.pm @@ -12,6 +12,11 @@ sub new { bless { dev => $dev }, $type; } +sub check_prog { + my ($in) = @_; + $::isInstall || $in->do_pkgs->ensure_binary_is_installed('ntfsprogs', 'ntfsresize'); +} + sub min_size { my ($o) = @_; my $r; -- cgit v1.2.1