diff options
Diffstat (limited to 'perl-install/diskdrake/resize_ntfs.pm')
| -rw-r--r-- | perl-install/diskdrake/resize_ntfs.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/diskdrake/resize_ntfs.pm b/perl-install/diskdrake/resize_ntfs.pm index 5af20f273..16c2f9459 100644 --- a/perl-install/diskdrake/resize_ntfs.pm +++ b/perl-install/diskdrake/resize_ntfs.pm @@ -5,7 +5,7 @@ use strict; use run_program; use common; - +# perl_checker: require interactive sub new { my ($type, $_device, $dev) = @_; @@ -13,8 +13,9 @@ sub new { } sub check_prog { - my ($in) = @_; - $::isInstall || $in->do_pkgs->ensure_binary_is_installed('ntfsprogs', 'ntfsresize'); + my ($in) = @_; # perl_checker: $in = interactive->new + #- ensure_binary_is_installed checks binary chrooted, whereas we run the binary non-chrooted (pb for Mageia One) + $::isInstall || whereis_binary('ntfsresize') || $in->do_pkgs->ensure_binary_is_installed('ntfsprogs', 'ntfsresize'); } sub min_size { @@ -29,7 +30,7 @@ sub resize { my @l = ('-ff', '-s' . int($size / 2) . 'ki', $o->{dev}); my $r; run_program::run('ntfsresize', '>', \$r, '-n', @l) or die "ntfsresize failed: $r\n"; - run_program::run('ntfsresize', '>', \$r, @l) or die "ntfsresize failed: $r\n"; + run_program::raw({ timeout => 'never' }, 'ntfsresize', '>', \$r, @l) or die "ntfsresize failed: $r\n"; } 1; |