summaryrefslogtreecommitdiffstats
path: root/perl-install/fsedit.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-08 23:09:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-08 23:09:32 +0000
commit15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3 (patch)
tree5fa84300a4af2638286890e21751c3090c6d2d4b /perl-install/fsedit.pm
parentcbb0bae07578f66abc44d3adb26f9e90cf6c8581 (diff)
downloaddrakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar.gz
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar.bz2
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar.xz
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.zip
no_comment
Diffstat (limited to 'perl-install/fsedit.pm')
-rw-r--r--perl-install/fsedit.pm11
1 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index c05a1b27b..c1fd12697 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -13,6 +13,7 @@ use detect_devices;
use Data::Dumper;
use fsedit;
use devices;
+use loopback;
use fs;
use log;
@@ -39,6 +40,7 @@ my @suggestions_mntpoints = qw(/mnt/dos);
my @partitions_signatures = (
[ 0x83, 0x438, "\x53\xEF" ],
[ 0x82, 4086, "SWAP-SPACE" ],
+ [ 0x7, 0x3, "NTFS" ],
[ 0xc, 0x1FE, "\x55\xAA", 0x52, "FAT32" ],
arch() !~ /^sparc/ ? (
[ 0x6, 0x1FE, "\x55\xAA", 0x36, "FAT" ],
@@ -92,12 +94,12 @@ sub readProcPartitions {
#- get all normal partition including special ones as found on sparc.
sub get_fstab(@) {
- map { partition_table::get_normal_parts($_) } @_;
+ loopback::loopbacks(@_), map { partition_table::get_normal_parts($_) } @_
}
#- get normal partition that should be visible for working on.
sub get_visible_fstab(@) {
- grep { $_ && !partition_table::isWholedisk($_) } get_fstab(@_);
+ grep { $_ && !partition_table::isWholedisk($_) } map { partition_table::get_normal_parts($_) } @_;
}
sub free_space(@) {
@@ -219,7 +221,10 @@ sub suggestions_mntpoint($) {
sub has_mntpoint($$) {
my ($mntpoint, $hds) = @_;
- scalar grep { $mntpoint eq $_->{mntpoint} } get_fstab(@$hds);
+ scalar grep {
+ $mntpoint eq $_->{mntpoint} ||
+ grep { $mntpoint eq $_->{mntpoint} } @{$_->{loopback} || []}
+ } get_fstab(@$hds);
}
#- do this before modifying $part->{mntpoint}