summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-05 19:34:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-05 19:34:44 +0000
commitfcc4ef31243b9e51adb718862d03762221bb37c2 (patch)
tree2e3ab26af93f802c02b20bc081f6235635817436
parent243305d3fdcc29ff8d8cf33ae8770700e18cdd0b (diff)
downloaddrakx-fcc4ef31243b9e51adb718862d03762221bb37c2.tar
drakx-fcc4ef31243b9e51adb718862d03762221bb37c2.tar.gz
drakx-fcc4ef31243b9e51adb718862d03762221bb37c2.tar.bz2
drakx-fcc4ef31243b9e51adb718862d03762221bb37c2.tar.xz
drakx-fcc4ef31243b9e51adb718862d03762221bb37c2.zip
don't allow partition types we don't know how to format in {partitions} for auto_installs (eg of bad type: ntfs)
-rw-r--r--perl-install/fs/format.pm5
-rw-r--r--perl-install/install_any.pm6
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 3b04bba56..bbeeed2f0 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -26,6 +26,11 @@ sub package_needed_for_partition_type {
$l->[0];
}
+sub known_type {
+ my ($part) = @_;
+ to_bool($cmds{$part->{fs_type}});
+}
+
sub check_package_is_installed {
my ($do_pkgs, $fs_type) = @_;
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 0bd973694..ea9e8fe9d 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1002,7 +1002,11 @@ sub g_auto_install {
$o->{default_packages} = pkgs::selected_leaves($::o->{packages});
my @fields = qw(mntpoint fs_type size);
- $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
+ $o->{partitions} = [ map {
+ my %l; @l{@fields} = @$_{@fields}; \%l;
+ } grep {
+ $_->{mntpoint} && fs::format::known_type($_);
+ } @{$::o->{fstab}} ];
exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe netcnx useSupermount autoExitInstall X services); #- TODO modules bootloader