diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-11-17 23:41:05 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-11-17 23:41:05 +0000 |
| commit | 91a28e36396280047d956f7428cfedc31d72057c (patch) | |
| tree | bef2e2fbdd543b13948a3cc35526f4a3dfd739e1 | |
| parent | 778b6f86075f44fe7cb1c29f05efa458edbb3b12 (diff) | |
| download | drakx-91a28e36396280047d956f7428cfedc31d72057c.tar drakx-91a28e36396280047d956f7428cfedc31d72057c.tar.gz drakx-91a28e36396280047d956f7428cfedc31d72057c.tar.bz2 drakx-91a28e36396280047d956f7428cfedc31d72057c.tar.xz drakx-91a28e36396280047d956f7428cfedc31d72057c.zip | |
diskdrake: don't request ntfs-3g on target not yet installed system if we are run inside draklive-install (#55160)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f34531f99..2e07e2c80 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -11,6 +11,8 @@ - fix detecting hidden partitions as recovery - diskdrake: o allow to convert ext2/3 to ext4 but do not enable flags + o don't request ntfs-3g on target not yet installed system if we are + run inside draklive-install (#55160) Version 12.77 - 30 October 2009 diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 50a7674d7..453594087 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -609,6 +609,7 @@ sub Type { return; } elsif ($type->{fs_type} =~ /ntfs/ && $part->{fs_type} =~ /ntfs/) { if ($type->{fs_type} eq 'ntfs-3g') { + local $::prefix = ''; # For draklive-install $in->do_pkgs->ensure_binary_is_installed('ntfs-3g', 'mount.ntfs-3g') or return; } put_in_hash($part, $type); |