summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-05-30 06:32:24 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-05-30 06:32:24 +0000
commitc6bea4ae86c6843d9f32150a6cd29d24006cf105 (patch)
tree8ff49ba3618f34dbb0f5f653ec25269a9f2d8689 /perl-install/install_any.pm
parent8d92bbc5bd3532828c89da38d0a08aab5b00be40 (diff)
downloaddrakx-c6bea4ae86c6843d9f32150a6cd29d24006cf105.tar
drakx-c6bea4ae86c6843d9f32150a6cd29d24006cf105.tar.gz
drakx-c6bea4ae86c6843d9f32150a6cd29d24006cf105.tar.bz2
drakx-c6bea4ae86c6843d9f32150a6cd29d24006cf105.tar.xz
drakx-c6bea4ae86c6843d9f32150a6cd29d24006cf105.zip
make drakx-in-chroot work
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 46cfd2769..a44a98685 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1567,7 +1567,7 @@ sub getHds {
$o->{all_hds} = $all_hds;
$o->{fstab} = [ fs::get::really_all_fstab($all_hds) ];
- fs::merge_info_from_mtab($o->{fstab});
+ fs::merge_info_from_mtab($o->{fstab}) if !$::local_install;
my @win = grep { isFat_or_NTFS($_) && maybeFormatted($_) && !$_->{is_removable} } @{$o->{fstab}};
log::l("win parts: ", join ",", map { $_->{device} } @win) if @win;
@@ -1784,7 +1784,7 @@ my $clp_name = 'mdkinst.clp';
sub clp_on_disk() { "$::prefix/tmp/$clp_name" }
sub move_clp_to_disk() {
- return if -e clp_on_disk();
+ return if -e clp_on_disk() || $::local_install;
my ($loop, $current_clp) = devices::find_clp_loop($clp_name) or return;
log::l("move_clp_to_disk: copying $current_clp to ", clp_on_disk());