summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-06 13:24:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-06 13:24:32 +0000
commit27b57fc70ecd1d4276fa07442f3d5a41c0907ebd (patch)
tree4dbfb66f91f9d284d1b99096d9bc6b6d7e871eee
parentf2f70d673d6d7caad289a3df0d1e76f2bb48c172 (diff)
downloaddrakx-backup-do-not-use-27b57fc70ecd1d4276fa07442f3d5a41c0907ebd.tar
drakx-backup-do-not-use-27b57fc70ecd1d4276fa07442f3d5a41c0907ebd.tar.gz
drakx-backup-do-not-use-27b57fc70ecd1d4276fa07442f3d5a41c0907ebd.tar.bz2
drakx-backup-do-not-use-27b57fc70ecd1d4276fa07442f3d5a41c0907ebd.tar.xz
drakx-backup-do-not-use-27b57fc70ecd1d4276fa07442f3d5a41c0907ebd.zip
ensure ntfsresize is available
-rw-r--r--perl-install/diskdrake/interactive.pm1
-rw-r--r--perl-install/diskdrake/resize_ntfs.pm5
2 files changed, 6 insertions, 0 deletions
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;