diff options
Diffstat (limited to 'perl-install/fs/mount.pm')
| -rw-r--r-- | perl-install/fs/mount.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index 80baee577..3c0696b75 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -1,4 +1,4 @@ -package fs::mount; # $Id: mount.pm 250965 2009-01-08 08:17:26Z pixel $ +package fs::mount; # $Id: mount.pm 267516 2010-04-12 16:40:47Z pterjan $ use diagnostics; use strict; @@ -35,7 +35,7 @@ sub mount { $fs or log::l("not mounting $dev partition"), return; { - my @fs_modules = qw(ext3 ext4dev hfs jfs nfs ntfs romfs reiserfs ufs xfs vfat); + my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat); my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devfs devpts auto ntfs-3g), @fs_modules); push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall; @@ -72,6 +72,12 @@ sub mount { fsck_jfs($dev, $o_wait_message); } elsif ($fs eq 'ext2' && !$b_rdonly) { fsck_ext2($dev, $o_wait_message); + } elsif ($fs eq 'davfs2') { + require fs::remote::davfs; + # We have to store credentials in davfs2 secret file before mounting + fs::remote::davfs::mountpoint_credentials_save($where, \@mount_opt); + # username and password options should be handled by /etc/davfs2/secrets file + @mount_opt = grep { !/^(username|password)=/ } @mount_opt; } push @mount_opt, 'ro' if $b_rdonly; @@ -172,7 +178,7 @@ sub part { } mount($dev, $mntpoint, $fs_type, $b_rdonly, $options, $o_wait_message); - if ($options =~ /usrquota|grpquota/ && member($part->{fs_type}, qw(ext3 ext4dev))) { + if ($options =~ /usrquota|grpquota/ && member($part->{fs_type}, qw(ext3 ext4))) { if (! find { -e "$mntpoint/$_" } qw(aquota.user aquota.group quota.user quota.group)) { #- quotacheck will create aquota.user and/or aquota.group, #- needed for quotas on ext3/ext4. @@ -216,7 +222,7 @@ sub umount_all { log::l("unmounting all filesystems"); foreach (sort { $b->{mntpoint} cmp $a->{mntpoint} } - grep { $_->{mntpoint} && !$_->{real_mntpoint} } @$fstab) { + grep { $_->{mntpoint} && !$_->{real_mntpoint} || isSwap($_) } @$fstab) { umount_part($_); } } |