summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-21 18:15:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-21 18:15:38 +0000
commitb4f3dca39879d6cece654e2623462634e82fe1aa (patch)
tree2bdb4e3bbbf723f0d7bc575ce6e067d8b7c1386e
parent976db1b453aca3e4702f54d6af2cba47aa24c222 (diff)
downloaddrakx-b4f3dca39879d6cece654e2623462634e82fe1aa.tar
drakx-b4f3dca39879d6cece654e2623462634e82fe1aa.tar.gz
drakx-b4f3dca39879d6cece654e2623462634e82fe1aa.tar.bz2
drakx-b4f3dca39879d6cece654e2623462634e82fe1aa.tar.xz
drakx-b4f3dca39879d6cece654e2623462634e82fe1aa.zip
(main): do postInstallNonRooted before postInstall (so that 'modprobe
vfat' can be done in postInstallNonRooted and used in postInstall)
-rw-r--r--perl-install/install2.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9e36510fb..13a8c96f1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -611,9 +611,9 @@ sub main {
-e "$o->{prefix}/usr/bin/urpmi" or eval { commands::rm("-rf", "$o->{prefix}/var/lib/urpmi") };
#- mainly for auto_install's
- run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall};
do { local $ENV{PATH} = $remote_path;
run_program::run("bash", "-c", $o->{postInstallNonRooted}) } if $o->{postInstallNonRooted};
+ run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall};
#- have the really bleeding edge ddebug.log
eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") };