summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-22 02:39:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-22 02:39:06 +0000
commit03ff5f3c5f6b7911b1cd4a10ce6f956124e997d5 (patch)
tree8c3b96ddccea76e1f49ccef6ebac0ca689e8f9a8
parent1603594e5d31c28a244424d498a6ba208fcf301f (diff)
downloaddrakx-03ff5f3c5f6b7911b1cd4a10ce6f956124e997d5.tar
drakx-03ff5f3c5f6b7911b1cd4a10ce6f956124e997d5.tar.gz
drakx-03ff5f3c5f6b7911b1cd4a10ce6f956124e997d5.tar.bz2
drakx-03ff5f3c5f6b7911b1cd4a10ce6f956124e997d5.tar.xz
drakx-03ff5f3c5f6b7911b1cd4a10ce6f956124e997d5.zip
set {is_removable} directly in fsedit::hds()
-rw-r--r--perl-install/fs.pm1
-rw-r--r--perl-install/fsedit.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index c5b26fbf4..4e5277c11 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -603,7 +603,6 @@ sub get_raw_hds {
push @{$all_hds->{raw_hds}}, detect_devices::removables();
$_->{is_removable} = 1 foreach @{$all_hds->{raw_hds}};
- $_->{is_removable} = 1 foreach map { partition_table::get_normal_parts($_) } grep { $_->{usb_media_type} } @{$all_hds->{hds}};
get_major_minor(@{$all_hds->{raw_hds}});
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 69a6bcb88..ce5c0cdee 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -239,6 +239,10 @@ sub hds {
$_->{device_LABEL} = $label if $label;
}
+ if ($hd->{usb_media_type}) {
+ $_->{is_removable} = 1 foreach partition_table::get_normal_parts($hd);
+ }
+
push @hds, $hd;
}