summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-03 21:54:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-03 21:54:16 +0000
commitd157c06993b22ebc4b82baa360ccc3816646089f (patch)
treee635202e20fe04d6ee6f5789d19833314ca49974 /perl-install/fs.pm
parent6bc6cf85943742adb82a8db65bf0a268b634c198 (diff)
downloaddrakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar
drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar.gz
drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar.bz2
drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar.xz
drakx-d157c06993b22ebc4b82baa360ccc3816646089f.zip
no_comment
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 43b88e69d..cf6ed3ebf 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -80,6 +80,7 @@ sub format_ext2($@) {
my ($dev, @options) = @_;
$dev =~ m,(rd|ida)/, and push @options, qw(-b 4096 -R stride=16); #- For RAID only.
+ push @options, qw(-b 1024 -O none) if arch() =~ /alpha/;
run_program::run("mke2fs", @options, devices::make($dev)) or die _("%s formatting of %s failed", "ext2", $dev);
}
@@ -367,6 +368,12 @@ sub write_fstab($;$$) {
print F join(" ", @$_), "\n" foreach sort { $a->[1] cmp $b->[1] } @to_add;
}
+sub merge_fstabs {
+ my ($fstab, $manualFstab) = @_;
+ my %l; $l{$_->{device}} = $_ foreach @$manualFstab;
+ add2hash_($_, $l{$_->{device}} || next) foreach @$fstab;
+}
+
#sub check_mount_all_fstab($;$) {
# my ($fstab, $prefix) = @_;
# $prefix ||= '';