diff options
Diffstat (limited to 'perl-install/fs/mount.pm')
| -rw-r--r-- | perl-install/fs/mount.pm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index 4365c0caa..6afaa9260 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -1,4 +1,4 @@ -package fs::mount; # $Id: mount.pm 267516 2010-04-12 16:40:47Z pterjan $ +package fs::mount; use diagnostics; use strict; @@ -35,8 +35,8 @@ sub mount { $fs or log::l("not mounting $dev partition"), return; { - 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 devpts auto ntfs-3g), @fs_modules); + my @fs_modules = qw(btrfs ext3 ext4 f2fs hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat); + my @types = (qw(ext2 proc sysfs iso9660 devpts auto ntfs-3g), @fs_modules); push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall; @@ -83,6 +83,7 @@ sub mount { push @mount_opt, 'ro' if $b_rdonly; $o_wait_message->(N("Mounting partition %s", $dev)) if $o_wait_message; + modules::load("fuse") if $::isInstall && $fs eq 'ntfs-3g' && ! -e '/dev/fuse'; run_program::run('mount', '-t', $fs, $dev, $where, if_(@mount_opt, '-o', join(',', @mount_opt))) or die N("mounting partition %s in directory %s failed", $dev, $where); } @@ -160,8 +161,6 @@ sub part { set_loop($part); $options = join(',', grep { !/^(encryption=|encrypted$|loop$)/ } split(',', $options)); #- we take care of this, don't let it mount see it } elsif (isLoopback($part)) { - #- mount will take care, but we must help it - devices::make("loop$_") foreach 0 .. 7; $options = join(',', uniq('loop', split(',', $options))); #- ensure the loop options is used } elsif ($part->{options} =~ /encrypted/) { log::l("skip mounting $part->{device} since we do not have the encrypt_key"); @@ -227,11 +226,10 @@ sub umount_all { } } -sub usbfs { +sub sys_kernel_debug { my ($prefix) = @_; - my $fs = cat_('/proc/filesystems') =~ /usbfs/ ? 'usbfs' : 'usbdevfs'; - mount('none', "$prefix/proc/bus/usb", $fs); + mount('none', "$prefix/sys/kernel/debug/usb", 'debugfs'); } 1; |