summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-01-30 10:37:05 +0000
committerThierry Vignaud <tv@mandriva.org>2009-01-30 10:37:05 +0000
commit6fb4405b769740fb3e63a975f957537d0daf81e6 (patch)
tree9fc65c0b84b9dcbdcebf7987bd4f67e74d11fb96
parentbcd0f56bd81444af43e00b063c1c3b87120fda93 (diff)
downloaddrakx-6fb4405b769740fb3e63a975f957537d0daf81e6.tar
drakx-6fb4405b769740fb3e63a975f957537d0daf81e6.tar.gz
drakx-6fb4405b769740fb3e63a975f957537d0daf81e6.tar.bz2
drakx-6fb4405b769740fb3e63a975f957537d0daf81e6.tar.xz
drakx-6fb4405b769740fb3e63a975f957537d0daf81e6.zip
(beforeInstallPackages) set up urpmi before installing packages
-rw-r--r--perl-install/install/steps.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 24b34c046..92bf5368d 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -382,6 +382,8 @@ sub beforeInstallPackages {
mkdir_p("$::prefix/usr/share");
install::media::getAndSaveFile_($o->{stage2_phys_medium}, "install/oem-theme.rpm", "$::prefix/usr/share/oem-theme.rpm");
+ $o->install_urpmi;
+
system("sh", "-c", $o->{preInstallNonRooted}) if $o->{preInstallNonRooted};
}
@@ -487,9 +489,6 @@ Consoles 1,3,4,7 may also contain interesting information";
run_program::rooted($::prefix, "chkconfig", "--del", "gpm");
}
- #- install urpmi before as rpmdb will be opened, this will cause problem with update-menus.
- $o->install_urpmi;
-
if ($o->{pcmcia}) {
substInFile { s/.*(TaskBarShowAPMStatus).*/$1=1/ } "$::prefix/usr/lib/X11/icewm/preferences";
eval { cp_af("$::prefix/usr/share/applnk/System/kapm.kdelnk",