diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-03 21:54:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-03 21:54:16 +0000 |
| commit | d157c06993b22ebc4b82baa360ccc3816646089f (patch) | |
| tree | e635202e20fe04d6ee6f5789d19833314ca49974 /perl-install/install_any.pm | |
| parent | 6bc6cf85943742adb82a8db65bf0a268b634c198 (diff) | |
| download | drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar.gz drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar.bz2 drakx-d157c06993b22ebc4b82baa360ccc3816646089f.tar.xz drakx-d157c06993b22ebc4b82baa360ccc3816646089f.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index d7e22cce1..3bcaecb44 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -303,6 +303,7 @@ I'll try to go on blanking bad partitions"), $err]) unless $o->{partitioning}{re ($o->{hds}, $o->{fstab}, $ok2) = fsedit::verifyHds($o->{hds}, $o->{partitioning}{readonly}, $ok); fs::check_mounted($o->{fstab}); + fs::merge_fstabs($o->{fstab}, $o->{manualFstab}); $o->{partitioning}{clearall} and return 1; $o->ask_warn('', @@ -624,6 +625,7 @@ sub install_urpmi { local *FILES; open FILES, "bzip2 -dc /tmp/$_->{hdlist} 2>/dev/null | hdlist2names - |"; chop, print LIST "$dir/$_\n" foreach <FILES>; close FILES or log::l("hdlist2names failed"), return; + close LIST; $dir .= " with ../base/$_->{hdlist}" if $method =~ /ftp|http/; "$name $dir\n"; |