From c03c4054aad5a3ac468c1a8b127eaa29947cf3c8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 18 Sep 2003 08:31:13 +0000
Subject: sanitize ld.so.conf *before* calling ldconfig

---
 perl-install/install_steps.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index bc8e52e74..da4edcf1b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -383,6 +383,8 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
     my $time = time();
     $ENV{DURING_INSTALL} = 1;
     pkgs::install($o->{prefix}, $o->{isUpgrade}, \@toInstall, $packages);
+
+    any::writeandclean_ldsoconf($o->{prefix});
     delete $ENV{DURING_INSTALL};
     run_program::rooted_or_die($o->{prefix}, 'ldconfig') unless $::g_auto_install;
     log::l("Install took: ", formatTimeRaw(time() - $time));
@@ -434,8 +436,6 @@ Consoles 1,3,4,7 may also contain interesting information";
     any::config_dvd($o->{prefix}, $have_devfsd);
     any::config_mtools($o->{prefix});
 
-    any::writeandclean_ldsoconf($o->{prefix});
-
     #- make sure wins is disabled in /etc/nsswitch.conf
     #- else if eth0 is not existing, glibc segfaults.
     substInFile { s/\s*wins// if /^\s*hosts\s*:/ } "$o->{prefix}/etc/nsswitch.conf";
-- 
cgit v1.2.1