diff options
Diffstat (limited to 'perl-install/fs.pm')
| -rw-r--r-- | perl-install/fs.pm | 481 |
1 files changed, 88 insertions, 393 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 542df8a3f..76cce10e7 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -1,10 +1,8 @@ -package fs; # $Id$ +package fs; use diagnostics; use strict; -use MDK::Common::System; -use MDK::Common::Various; use common; use log; use devices; @@ -12,18 +10,19 @@ use fs::type; use fs::get; use fs::format; use fs::mount_options; +use fs::loopback; +use fs::mount; use run_program; use detect_devices; use modules; use fsedit; -use loopback; sub read_fstab { my ($prefix, $file, @reading_options) = @_; if (member('keep_default', @reading_options)) { - push @reading_options, 'freq_passno', 'keep_devfs_name', 'keep_device_LABEL'; + push @reading_options, 'freq_passno', 'keep_device_LABEL', 'keep_device_UUID'; } my %comments; @@ -50,27 +49,11 @@ sub read_fstab { $options = 'defaults' if $options eq 'rw'; # clean-up for mtab read - if ($fs_type eq 'supermount') { - # normalize this bloody supermount - $options = join(",", 'supermount', grep { - if (/fs=(.*)/) { - $fs_type = $1; - 0; - } elsif (/dev=(.*)/) { - $dev = $1; - 0; - } elsif ($_ eq '--') { - 0; - } else { - 1; - } - } split(',', $options)); - } elsif ($fs_type eq 'smb') { - # prefering type "smbfs" over "smb" - $fs_type = 'smbfs'; + s/\\040/ /g foreach $mntpoint, $dev, $options; + + if ($fs_type eq 'ext4') { + $options = join(",", grep { !/extents/ } split(',', $options)) || 'defaults'; } - $mntpoint =~ s/\\040/ /g; - $dev =~ s/\\040/ /g; my $h = { mntpoint => $mntpoint, fs_type => $fs_type, @@ -78,25 +61,34 @@ sub read_fstab { if_(member('keep_freq_passno', @reading_options), freq => $freq, passno => $passno), }; - put_in_hash($h, subpart_from_wild_device_name($dev)); + put_in_hash($h, fs::wild_device::to_subpart($dev)); - if ($h->{device_LABEL} && member('keep_device_LABEL', @reading_options)) { + if ($h->{device_LABEL} && !$h->{device_alias} && member('keep_device_LABEL', @reading_options)) { $h->{prefer_device_LABEL} = 1; - } elsif ($h->{devfs_device} && member('keep_devfs_name', @reading_options)) { - $h->{prefer_devfs_name} = 1; + } elsif ($h->{device_UUID} && !$h->{device_alias} && member('keep_device_UUID', @reading_options)) { + $h->{prefer_device_UUID} = 1; + } else { + $h->{prefer_device} = 1; } if ($h->{options} =~ /credentials=/ && !member('verbatim_credentials', @reading_options)) { - require network::smb; + require fs::remote::smb; #- remove credentials=file with username=foo,password=bar,domain=zoo #- the other way is done in fstab_to_string my ($options, $unknown) = fs::mount_options::unpack($h); my $file = delete $options->{'credentials='}; - my $credentials = network::smb::read_credentials_raw($file); + my $credentials = fs::remote::smb::read_credentials_raw($file); if ($credentials->{username}) { $options->{"$_="} = $credentials->{$_} foreach qw(username password domain); fs::mount_options::pack($h, $options, $unknown); } + } elsif ($h->{fs_type} eq 'davfs2' && !member('verbatim_credentials', @reading_options)) { + require fs::remote::davfs; + if (my $credentials = fs::remote::davfs::read_credentials($h->{mntpoint})) { + my ($options, $unknown) = fs::mount_options::unpack($h); + $options->{"$_="} = $credentials->{$_} foreach qw(username password); + fs::mount_options::pack($h, $options, $unknown); + } } $h; @@ -107,17 +99,21 @@ sub merge_fstabs { my ($loose, $fstab, @l) = @_; foreach my $p (@$fstab) { - my ($l1, $l2) = partition { fsedit::is_same_hd($_, $p) } @l; + my ($l1, $l2) = partition { fs::get::is_same_hd($_, $p) } @l; my ($p2) = @$l1 or next; @l = @$l2; $p->{mntpoint} = $p2->{mntpoint} if delete $p->{unsafeMntpoint}; - $p->{fs_type} = $p2->{fs_type} if $p2->{fs_type} && !$loose; - $p->{options} = $p2->{options} if $p2->{options} && !$loose; - #- important to get isMounted property else DrakX may try to mount already mounted partitions :-( - add2hash($p, $p2); - $p->{device_alias} ||= $p2->{device_alias} || $p2->{device} if $p->{device} ne $p2->{device} && $p2->{device} !~ m|/|; + if (!$loose) { + $p->{fs_type} = $p2->{fs_type} if $p2->{fs_type}; + $p->{options} = $p2->{options} if $p2->{options}; + add2hash_($p, $p2); + } else { + $p->{isMounted} ||= $p2->{isMounted}; + $p->{real_mntpoint} ||= $p2->{real_mntpoint}; + } + $p->{device_alias} ||= $p2->{device_alias} if $p->{device} ne $p2->{device} && $p2->{device} !~ m|/|; $p->{fs_type} && $p2->{fs_type} && $p->{fs_type} ne $p2->{fs_type} && $p->{fs_type} ne 'auto' && $p2->{fs_type} ne 'auto' and @@ -126,95 +122,6 @@ sub merge_fstabs { @l; } -sub analyze_wild_device_name { - my ($dev) = @_; - - if ($dev =~ m!^/u?dev/(.*)!) { - 'dev', $dev; - } elsif ($dev !~ m!^/! && -e "$::prefix/dev/$dev") { - 'dev', "/dev/$dev"; - } elsif ($dev =~ /^LABEL=(.*)/) { - 'label', $1; - } elsif ($dev eq 'none' || $dev eq 'rootfs') { - 'virtual'; - } elsif ($dev =~ m!^(\S+):/\w!) { - 'nfs'; - } elsif ($dev =~ m!^//\w!) { - 'smb'; - } elsif ($dev =~ m!^http://!) { - 'dav'; - } -} - -sub subpart_from_wild_device_name { - my ($dev) = @_; - - my $part = { device => $dev, faked_device => 1 }; #- default - - if (my ($kind, $val) = analyze_wild_device_name($dev)) { - if ($kind eq 'label') { - $part->{device_LABEL} = $val; - } elsif ($kind eq 'dev') { - my %part = (faked_device => 0); - if (my $rdev = (stat "$::prefix$dev")[6]) { - ($part{major}, $part{minor}) = unmakedev($rdev); - } - - my $symlink = readlink("$::prefix$dev"); - $dev =~ s!/u?dev/!!; - - if ($symlink && $symlink =~ m|^[^/]+$|) { - $part{device_alias} = $dev; - $dev = $symlink; - } - - if (my (undef, $part_number) = $dev =~ m!/(disc|part(\d+))$!) { - $part{part_number} = $part_number if $part_number; - $part{devfs_device} = $dev; - } else { - my $part_number = devices::part_number(\%part); - $part{part_number} = $part_number if $part_number; - } - $part{device} = $dev; - return \%part; - } - } else { - if ($dev =~ m!^/! && -f "$::prefix$dev") { - #- it must be a loopback file or directory to bind - } else { - log::l("part_from_wild_device_name: unknown device $dev"); - } - } - $part; -} - -sub part2wild_device_name { - my ($prefix, $part) = @_; - - if ($part->{prefer_device_LABEL}) { - 'LABEL=' . $part->{device_LABEL}; - } elsif ($part->{prefer_devfs_name}) { - "/dev/$part->{devfs_device}"; - } elsif ($part->{device_alias}) { - "/dev/$part->{device_alias}"; - } else { - my $faked_device = exists $part->{faked_device} ? - $part->{faked_device} : - do { - #- in case $part has been created without using subpart_from_wild_device_name() - my ($kind) = analyze_wild_device_name($part->{device}); - $kind ? $kind ne 'dev' : $part->{device} =~ m!^/!; - }; - if ($faked_device) { - $part->{device}; - } else { - my $dev = "/dev/$part->{device}"; - eval { devices::make("$prefix$dev") }; - $dev; - } - } -} - sub add2all_hds { my ($all_hds, @l) = @_; @@ -223,8 +130,8 @@ sub add2all_hds { foreach (@l) { my $s = $_->{fs_type} eq 'nfs' ? 'nfss' : - $_->{fs_type} eq 'smbfs' ? 'smbs' : - $_->{fs_type} eq 'davfs' ? 'davs' : + $_->{fs_type} eq 'cifs' ? 'smbs' : + $_->{fs_type} eq 'davfs2' ? 'davs' : isTrueLocalFS($_) || isSwap($_) || isOtherAvailableFS($_) ? '' : 'special'; push @{$all_hds->{$s}}, $_ if $s; @@ -232,10 +139,13 @@ sub add2all_hds { } sub get_major_minor { - eval { - my (undef, $major, $minor) = devices::entry($_->{device}); - ($_->{major}, $_->{minor}) = ($major, $minor); - } foreach @_; + my ($fstab) = @_; + foreach (@$fstab) { + eval { + my (undef, $major, $minor) = devices::entry($_->{device}); + ($_->{major}, $_->{minor}) = ($major, $minor); + }; + } } sub merge_info_from_mtab { @@ -251,16 +161,11 @@ sub merge_info_from_mtab { foreach (@l1, @l2) { log::l("found mounted partition on $_->{device} with $_->{mntpoint}"); - if ($::isInstall && $_->{mntpoint} =~ m!/tmp/(image|hdimage)!) { + if ($::isInstall && $_->{mntpoint} =~ m!^/tmp/\w*image$!) { $_->{real_mntpoint} = delete $_->{mntpoint}; - if ($_->{real_mntpoint} eq '/tmp/hdimage') { - log::l("found hdimage on $_->{device}"); - $_->{mntpoint} = "/mnt/hd"; #- remap for hd install. - } } $_->{isMounted} = 1; set_isFormatted($_, 1); - delete $_->{options}; } merge_fstabs('loose', $fstab, @l1, @l2); } @@ -272,7 +177,7 @@ sub merge_info_from_fstab { my @l = grep { if ($uniq) { my $part = fs::get::mntpoint2part($_->{mntpoint}, $fstab); - !$part || fsedit::is_same_hd($part, $_); #- keep it only if it is the mountpoint AND the same device + !$part || fs::get::is_same_hd($part, $_); #- keep it only if it is the mount point AND the same device } else { 1; } @@ -288,26 +193,33 @@ sub get_info_from_fstab { } sub prepare_write_fstab { - my ($fstab, $o_prefix, $b_keep_smb_credentials) = @_; + my ($fstab, $o_prefix, $b_keep_credentials) = @_; $o_prefix ||= ''; my %new; - my @smb_credentials; + my (@smb_credentials, @davfs_credentials); my @l = map { my $device = isLoopback($_) ? ($_->{mntpoint} eq '/' ? "/initrd/loopfs" : $_->{loopback_device}{mntpoint}) . $_->{loopback_file} : - part2wild_device_name($o_prefix, $_); + fs::wild_device::from_part($o_prefix, $_); + + my $comment = $_->{comment}; + $comment = '' if $comment =~ m!^Entry for /dev/.* :!; + $comment ||= "# Entry for /dev/$_->{device} :\n" if $device =~ /^(UUID|LABEL)=/; my $real_mntpoint = $_->{mntpoint} || ${{ '/tmp/hdimage' => '/mnt/hd' }}{$_->{real_mntpoint}}; - mkdir_p("$o_prefix$real_mntpoint") if $real_mntpoint =~ m|^/|; - my $mntpoint = loopback::carryRootLoopback($_) ? '/initrd/loopfs' : $real_mntpoint; + if (!member('bind', split(',', $_->{options}))) { + mkdir_p("$o_prefix$real_mntpoint") if $real_mntpoint =~ m|^/|; + } + my $mntpoint = fs::type::carry_root_loopback($_) ? '/initrd/loopfs' : $real_mntpoint; + my $needed_to_boot = member($_->{mntpoint}, fs::type::directories_needed_to_boot()); my ($freq, $passno) = exists $_->{freq} ? ($_->{freq}, $_->{passno}) : - isTrueLocalFS($_) && $_->{options} !~ /encryption=/ && !$_->{is_removable} ? - (1, $_->{mntpoint} eq '/' ? 1 : loopback::carryRootLoopback($_) ? 0 : 2) : + isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || $needed_to_boot) ? + (1, $_->{mntpoint} eq '/' ? 1 : fs::type::carry_root_loopback($_) ? 0 : 2) : (0, 0); if (($device eq 'none' || !$new{$device}) && ($mntpoint eq 'swap' || !$new{$mntpoint})) { @@ -315,36 +227,32 @@ sub prepare_write_fstab { $new{$device} = 1; $new{$mntpoint} = 1; - my $options = $_->{options}; + my $options = $_->{options} || 'defaults'; + if (($_->{is_removable} || member($_->{fs_type}, qw(ntfs ntfs-3g))) && !$needed_to_boot && $_->{options} !~ /nofail/) { + $options .= ',nofail'; + } - if ($_->{fs_type} eq 'smbfs' && $options =~ /password=/ && !$b_keep_smb_credentials) { - require network::smb; - if (my ($opts, $smb_credentials) = network::smb::fstab_entry_to_credentials($_)) { + if ($_->{fs_type} eq 'cifs' && $options =~ /password=/ && !$b_keep_credentials) { + require fs::remote::smb; + if (my ($opts, $smb_credentials) = fs::remote::smb::fstab_entry_to_credentials($_)) { $options = $opts; push @smb_credentials, $smb_credentials; } + } elsif ($_->{fs_type} eq 'davfs2' && !$b_keep_credentials) { + require fs::remote::davfs; + if (my ($opts, $davfs_credentials) = fs::remote::davfs::fstab_entry_to_credentials($_)) { + $options = $opts || 'defaults'; + push @davfs_credentials, $davfs_credentials; + } } my $fs_type = $_->{fs_type} || 'auto'; - $mntpoint =~ s/ /\\040/g; - $device =~ s/ /\\040/g; - - # handle bloody supermount special case - if ($options =~ /supermount/) { - my @l = grep { $_ ne 'supermount' } split(',', $options); - my ($l1, $l2) = partition { member($_, 'ro', 'exec') } @l; - $options = join(",", "dev=$device", "fs=$fs_type", @$l1, if_(@$l2, '--', @$l2)); - ($device, $fs_type) = ('none', 'supermount'); - } else { - #- if we were using supermount, the type could be something like ext2:vfat - #- but this can not be done without supermount, so switching to "auto" - $fs_type = 'auto' if $fs_type =~ /:/; - } + s/ /\\040/g foreach $mntpoint, $device, $options; my $file_dep = $options =~ /\b(loop|bind)\b/ ? $device : ''; - [ $file_dep, $mntpoint, $_->{comment} . join(' ', $device, $mntpoint, $fs_type, $options || 'defaults', $freq, $passno) . "\n" ]; + [ $file_dep, $mntpoint, $comment . join(' ', $device, $mntpoint, $fs_type, $options, $freq, $passno) . "\n" ]; } else { (); } @@ -367,13 +275,13 @@ sub prepare_write_fstab { } @l = sort_it(@l); - join('', map { $_->[2] } @l), \@smb_credentials; + join('', map { $_->[2] } @l), \@smb_credentials, \@davfs_credentials; } sub fstab_to_string { my ($all_hds, $o_prefix) = @_; my $fstab = [ fs::get::really_all_fstab($all_hds), @{$all_hds->{special}} ]; - my ($s, undef) = prepare_write_fstab($fstab, $o_prefix, 'keep_smb_credentials'); + my ($s, undef) = prepare_write_fstab($fstab, $o_prefix, 'keep_credentials'); $s; } @@ -381,13 +289,13 @@ sub write_fstab { my ($all_hds, $o_prefix) = @_; log::l("writing $o_prefix/etc/fstab"); my $fstab = [ fs::get::really_all_fstab($all_hds), @{$all_hds->{special}} ]; - my ($s, $smb_credentials) = prepare_write_fstab($fstab, $o_prefix, ''); + my ($s, $smb_credentials, $davfs_credentials) = prepare_write_fstab($fstab, $o_prefix, ''); + renamef("$o_prefix/etc/fstab", "$o_prefix/etc/fstab.old"); output("$o_prefix/etc/fstab", $s); - network::smb::save_credentials($_) foreach @$smb_credentials; -} - -sub auto_fs() { - grep { chop; $_ && !/nodev/ } cat_("/etc/filesystems"); + require fs::remote::davfs; + fs::remote::smb::save_credentials($_) foreach @$smb_credentials; + fs::remote::davfs::save_credentials($davfs_credentials); + fs::dmcrypt::save_crypttab($all_hds) if @{$all_hds->{dmcrypts}}; } sub set_removable_mntpoints { @@ -396,10 +304,10 @@ sub set_removable_mntpoints { my %names; foreach (@{$all_hds->{raw_hds}}) { my $name = detect_devices::suggest_mount_point($_) or next; - $name eq 'zip' and next; + member($name, qw(zip cdrom)) and next; my $s = ++$names{$name}; - $_->{mntpoint} ||= "/mnt/$name" . ($s == 1 ? '' : $s); + $_->{mntpoint} ||= "/media/$name" . ($s == 1 ? '' : $s); } } @@ -409,231 +317,18 @@ sub get_raw_hds { push @{$all_hds->{raw_hds}}, detect_devices::removables(); $_->{is_removable} = 1 foreach @{$all_hds->{raw_hds}}; - get_major_minor(@{$all_hds->{raw_hds}}); + get_major_minor($all_hds->{raw_hds}); my @fstab = read_fstab($prefix, '/etc/fstab', 'keep_default'); $all_hds->{nfss} = [ grep { $_->{fs_type} eq 'nfs' } @fstab ]; - $all_hds->{smbs} = [ grep { $_->{fs_type} eq 'smbfs' } @fstab ]; - $all_hds->{davs} = [ grep { $_->{fs_type} eq 'davfs' } @fstab ]; + $all_hds->{smbs} = [ grep { $_->{fs_type} eq 'cifs' } @fstab ]; + $all_hds->{davs} = [ grep { $_->{fs_type} eq 'davfs2' } @fstab ]; $all_hds->{special} = [ (grep { $_->{fs_type} eq 'tmpfs' } @fstab), { device => 'none', mntpoint => '/proc', fs_type => 'proc' }, ]; } - -################################################################################ -# mounting functions -################################################################################ -sub set_loop { - my ($part) = @_; - $part->{real_device} ||= devices::set_loop(devices::make($part->{device}), $part->{encrypt_key}, $part->{options} =~ /encryption=(\w+)/); -} - -sub swapon { - my ($dev) = @_; - log::l("swapon called with $dev"); - syscall_('swapon', devices::make($dev), 0) or die "swapon($dev) failed: $!"; -} - -sub swapoff { - my ($dev) = @_; - syscall_('swapoff', devices::make($dev)) or die "swapoff($dev) failed: $!"; -} - -sub formatMount_part { - my ($part, $raids, $fstab, $prefix, $wait_message) = @_; - - if (isLoopback($part)) { - formatMount_part($part->{loopback_device}, $raids, $fstab, $prefix, $wait_message); - } - if (my $p = fs::get::up_mount_point($part->{mntpoint}, $fstab)) { - formatMount_part($p, $raids, $fstab, $prefix, $wait_message) unless loopback::carryRootLoopback($part); - } - if ($part->{toFormat}) { - fs::format::part($raids, $part, $prefix, $wait_message); - } - mount_part($part, $prefix, 0, $wait_message); -} - -sub formatMount_all { - my ($raids, $fstab, $prefix, $o_wait_message) = @_; - formatMount_part($_, $raids, $fstab, $prefix, $o_wait_message) - foreach sort { isLoopback($a) ? 1 : isSwap($a) ? -1 : 0 } grep { $_->{mntpoint} } @$fstab; - - #- ensure the link is there - loopback::carryRootCreateSymlink($_, $prefix) foreach @$fstab; - - #- for fun :) - #- that way, when install exits via ctrl-c, it gives hand to partition - eval { - my ($_type, $major, $minor) = devices::entry(fs::get::root($fstab)->{device}); - output "/proc/sys/kernel/real-root-dev", makedev($major, $minor); - }; -} - -sub mount { - my ($dev, $where, $fs, $b_rdonly, $o_options, $o_wait_message) = @_; - log::l("mounting $dev on $where as type $fs, options $o_options"); - - -d $where or mkdir_p($where); - - $dev = part2wild_device_name('', { device => $dev }); - - $fs or log::l("not mounting $dev partition"), return; - - my @fs_modules = qw(vfat hfs romfs ufs reiserfs xfs jfs ext3); - - if (member($fs, 'smb', 'smbfs', 'nfs', 'davfs', 'ntfs') && $::isStandalone || $::move) { - $o_wait_message->(N("Mounting partition %s", $dev)) if $o_wait_message; - system('mount', '-t', $fs, $dev, $where, if_($o_options, '-o', $o_options)) == 0 or die N("mounting partition %s in directory %s failed", $dev, $where); - } else { - my @types = ('ext2', 'proc', 'sysfs', 'usbdevfs', 'iso9660', 'devfs', 'devpts', @fs_modules); - - member($fs, @types) or log::l("skipping mounting $dev partition ($fs)"), return; - - $where =~ s|/$||; - - my $flag = c::MS_MGC_VAL(); - $flag |= c::MS_RDONLY() if $b_rdonly; - my $mount_opt = ""; - - if ($fs eq 'vfat') { - $mount_opt = 'check=relaxed'; - } elsif ($fs eq 'reiserfs') { - #- could be better if we knew if there is a /boot or not - #- without knowing it, / is forced to be mounted with notail - # if $where =~ m|/(boot)?$|; - $mount_opt = 'notail'; #- notail in any case - } elsif ($fs eq 'jfs' && !$b_rdonly) { - $o_wait_message->(N("Checking %s", $dev)) if $o_wait_message; - #- needed if the system is dirty otherwise mounting read-write simply fails - run_program::raw({ timeout => 60 * 60 }, "fsck.jfs", $dev) or do { - my $err = $?; - die "fsck.jfs failed" if $err & 0xfc00; - }; - } elsif ($fs eq 'ext2' && !$b_rdonly) { - $o_wait_message->(N("Checking %s", $dev)) if $o_wait_message; - foreach ('-a', '-y') { - run_program::raw({ timeout => 60 * 60 }, "fsck.ext2", $_, $dev); - my $err = $?; - if ($err & 0x0100) { - log::l("fsck corrected partition $dev"); - } - if ($err & 0xfeff) { - my $txt = sprintf("fsck failed on %s with exit code %d or signal %d", $dev, $err >> 8, $err & 255); - $_ eq '-y' ? die($txt) : cdie($txt); - } else { - last; - } - } - } - if (member($fs, @fs_modules)) { - eval { modules::load($fs) }; - } elsif ($fs eq 'iso9660') { - eval { modules::load('isofs') }; - } - log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)"); - $o_wait_message->(N("Mounting partition %s", $dev)) if $o_wait_message; - syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die N("mounting partition %s in directory %s failed", $dev, $where) . " ($!)"; - - eval { #- fail silently, /etc may be read-only - append_to_file("/etc/mtab", "$dev $where $fs defaults 0 0\n"); - }; - } -} - -#- takes the mount point to umount (can also be the device) -sub umount { - my ($mntpoint) = @_; - $mntpoint =~ s|/$||; - log::l("calling umount($mntpoint)"); - - syscall_('umount2', $mntpoint, 0) or do { - kill 15, fuzzy_pidofs('^fam\b'); - syscall_('umount2', $mntpoint, 0) or die N("error unmounting %s: %s", $mntpoint, $!); - }; - - substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- do not care about error, if we can not read, we will not manage to write... (and mess mtab) -} - -sub mount_part { - my ($part, $o_prefix, $b_rdonly, $o_wait_message) = @_; - - #- root carrier's link can not be mounted - loopback::carryRootCreateSymlink($part, $o_prefix); - - log::l("isMounted=$part->{isMounted}, real_mntpoint=$part->{real_mntpoint}, mntpoint=$part->{mntpoint}"); - if ($part->{isMounted} && $part->{real_mntpoint} && $part->{mntpoint}) { - log::l("remounting partition on $o_prefix$part->{mntpoint} instead of $part->{real_mntpoint}"); - if ($::isInstall) { #- ensure partition will not be busy. - require install_any; - install_any::getFile('XXX'); - } - eval { - umount($part->{real_mntpoint}); - rmdir $part->{real_mntpoint}; - symlinkf "$o_prefix$part->{mntpoint}", $part->{real_mntpoint}; - delete $part->{real_mntpoint}; - $part->{isMounted} = 0; - }; - } - - return if $part->{isMounted}; - - unless ($::testing) { - if (isSwap($part)) { - $o_wait_message->(N("Enabling swap partition %s", $part->{device})) if $o_wait_message; - swapon($part->{device}); - } else { - $part->{mntpoint} or die "missing mount point for partition $part->{device}"; - - my $mntpoint = ($o_prefix || '') . $part->{mntpoint}; - if (isLoopback($part) || $part->{encrypt_key}) { - set_loop($part); - } elsif ($part->{options} =~ /encrypted/) { - log::l("skip mounting $part->{device} since we do not have the encrypt_key"); - return; - } elsif (loopback::carryRootLoopback($part)) { - $mntpoint = "/initrd/loopfs"; - } - my $dev = $part->{real_device} || $part->{device}; - mount($dev, $mntpoint, $part->{fs_type}, $b_rdonly, $part->{options}, $o_wait_message); - rmdir "$mntpoint/lost+found"; - } - } - $part->{isMounted} = 1; - set_isFormatted($part, 1); #- assume that if mount works, partition is formatted -} - -sub umount_part { - my ($part, $o_prefix) = @_; - - $part->{isMounted} || $part->{real_mntpoint} or return; - - unless ($::testing) { - if (isSwap($part)) { - swapoff($part->{device}); - } elsif (loopback::carryRootLoopback($part)) { - umount("/initrd/loopfs"); - } else { - umount(($o_prefix || '') . $part->{mntpoint} || devices::make($part->{device})); - devices::del_loop(delete $part->{real_device}) if $part->{real_device}; - } - } - $part->{isMounted} = 0; -} - -sub umount_all($;$) { - my ($fstab, $prefix) = @_; - - log::l("unmounting all filesystems"); - - foreach (sort { $b->{mntpoint} cmp $a->{mntpoint} } @$fstab) { - $_->{mntpoint} and umount_part($_, $prefix); - } -} - ################################################################################ # various functions ################################################################################ @@ -649,7 +344,7 @@ sub df { return; #- will not even try! } else { mkdir_p($dir); - eval { mount($part->{device}, $dir, $part->{fs_type}, 'readonly') }; + eval { fs::mount::mount(devices::make($part->{device}), $dir, $part->{fs_type}, 'readonly') }; if ($@) { set_isFormatted($part, 0); unlink $dir; @@ -659,7 +354,7 @@ sub df { my (undef, $free) = MDK::Common::System::df($dir); if (!$part->{isMounted}) { - umount($dir); + fs::mount::umount($dir); unlink($dir); } |