summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 10:46:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 10:46:31 +0000
commit3aa0c1b20adfec6ec15221c2a99b5313d443bfbc (patch)
tree44b8aeb752bd62d7fafc49f39416732618719cfb
parent9e97fbbc97fcd8f23c5770f0316fdb267d112a91 (diff)
downloaddrakx-3aa0c1b20adfec6ec15221c2a99b5313d443bfbc.tar
drakx-3aa0c1b20adfec6ec15221c2a99b5313d443bfbc.tar.gz
drakx-3aa0c1b20adfec6ec15221c2a99b5313d443bfbc.tar.bz2
drakx-3aa0c1b20adfec6ec15221c2a99b5313d443bfbc.tar.xz
drakx-3aa0c1b20adfec6ec15221c2a99b5313d443bfbc.zip
for local_install we don't want use_root_part to do anything
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 37b1f5cda..c7ea7ebc4 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1632,6 +1632,8 @@ sub migrate_device_names {
sub use_root_part {
my ($all_hds, $part, $o_in) = @_;
+ return if $::local_install;
+
my $migrate_device_names;
{
my $handle = any::inspect($part, $::prefix) or internal_error();
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 45ce83191..ce734461b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -169,7 +169,7 @@ sub selectInstallClass {
if ($o->{partitioning}{use_existing_root} || $o->{isUpgrade}) {
# either one root is defined (and all is ok), or we take the first one we find
my $p = fs::get::root_($o->{fstab}) || (first(install_any::find_root_parts($o->{fstab}, $o->{prefix})) || die)->{part};
- $o->{migrate_device_names} = install_any::use_root_part($o->{all_hds}, $p) if !$::local_install;
+ $o->{migrate_device_names} = install_any::use_root_part($o->{all_hds}, $p);
}
}