summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-09 10:56:27 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-09 10:56:27 +0000
commitbda1a4b6aadf9fa1eba91a5ff8893a72d6218ef6 (patch)
tree2e04026e7f6fca71104a9e136c0a0789b2e4d0cf
parentbc1ebb20043bf36703fd813ed540ab1b7d769a2c (diff)
downloaddrakx-bda1a4b6aadf9fa1eba91a5ff8893a72d6218ef6.tar
drakx-bda1a4b6aadf9fa1eba91a5ff8893a72d6218ef6.tar.gz
drakx-bda1a4b6aadf9fa1eba91a5ff8893a72d6218ef6.tar.bz2
drakx-bda1a4b6aadf9fa1eba91a5ff8893a72d6218ef6.tar.xz
drakx-bda1a4b6aadf9fa1eba91a5ff8893a72d6218ef6.zip
(get_media) adjust media path for 32 bit DVD/CD installations
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/media.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1005849f1..71b164367 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
Version 12.9 - 9 March 2009
+- adjust media path for 32 bit DVD/CD installations
- package installation:
o ask for retry
o log bogus signatures
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index f9b4b7022..310365a03 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -503,7 +503,7 @@ sub get_media {
|| $phys_m->{real_mntpoint} || $phys_m->{url};
# adjust URI for cdroms if needed:
if ($o->{stage2_phys_medium}{method} eq 'cdrom') {
- $uri .= "/" . arch();
+ $uri .= "/" . $MDK::Common::System::compat_arch{arch()};
system('cp', "$uri/media/media_info/compssUsers.pl", '/tmp/compssUsers.pl');
} else {
_get_compsUsers_pl($phys_m, $_->{force_rpmsrate});