summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-28 09:31:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-28 09:31:40 +0000
commitf2929b6fd89ca52a12b18d154d3a5b44c40c4e9a (patch)
tree8d7102d9f54979cac607061c14488e31d199dc1e /perl-install/fs
parent3ffa6ec498bb676e891027e56a9122aef1d6b02e (diff)
downloaddrakx-backup-do-not-use-f2929b6fd89ca52a12b18d154d3a5b44c40c4e9a.tar
drakx-backup-do-not-use-f2929b6fd89ca52a12b18d154d3a5b44c40c4e9a.tar.gz
drakx-backup-do-not-use-f2929b6fd89ca52a12b18d154d3a5b44c40c4e9a.tar.bz2
drakx-backup-do-not-use-f2929b6fd89ca52a12b18d154d3a5b44c40c4e9a.tar.xz
drakx-backup-do-not-use-f2929b6fd89ca52a12b18d154d3a5b44c40c4e9a.zip
- create fs::type::directories_needed_to_boot() and use it
- for removable drives used for / /usr and the like, ensure we check it at boot time (bugzilla #13283)
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/mount_options.pm2
-rw-r--r--perl-install/fs/type.pm4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 117bbd0b2..77aef9aac 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -168,7 +168,7 @@ sub set_default {
my ($options, $unknown) = &unpack($part);
if (!$opts{ignore_is_removable} && $part->{is_removable}
- && !member($part->{mntpoint}, qw(/ /usr /var /boot))
+ && !member($part->{mntpoint}, fs::type::directories_needed_to_boot())
&& (!$part->{fs_type} || $part->{fs_type} eq 'auto' || $part->{fs_type} =~ /:/)) {
$options->{supermount} = $opts{useSupermount} && !($opts{useSupermount} eq 'magicdev' && $part->{media_type} eq 'cdrom');
$part->{fs_type} = !$options->{supermount} ? 'auto' :
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index a858556a6..57de303c3 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -369,3 +369,7 @@ sub check {
$fs_type eq "jfs" && $part->{size} < 16 << 11 and die N("You can not use JFS for partitions smaller than 16MB");
$fs_type eq "reiserfs" && $part->{size} < 32 << 11 and die N("You can not use ReiserFS for partitions smaller than 32MB");
}
+
+sub directories_needed_to_boot() {
+ qw(/ /usr /var /boot /tmp);
+}