summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-06-03 12:08:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-06-03 12:08:35 +0000
commit337801868e55146ca66221654d6295d0e24b01a7 (patch)
tree9bf0de3ebd466995f98b59cae762b08a868e96d7 /perl-install/install_steps.pm
parentf9ee79ed64ed8ad891671e9920ef945f5bd5eca5 (diff)
downloaddrakx-337801868e55146ca66221654d6295d0e24b01a7.tar
drakx-337801868e55146ca66221654d6295d0e24b01a7.tar.gz
drakx-337801868e55146ca66221654d6295d0e24b01a7.tar.bz2
drakx-337801868e55146ca66221654d6295d0e24b01a7.tar.xz
drakx-337801868e55146ca66221654d6295d0e24b01a7.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8c4d5d2d2..c209b56e8 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -51,7 +51,7 @@ sub leavingStep {
log::l("step `$step' finished");
if (-d "$o->{prefix}/root") {
- eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") };
+ eval { commands::cp('-f', "/tmp/ddebug.log", "/tmp/exec.log", "$o->{prefix}/root") };
install_any::g_auto_install();
}
@@ -305,9 +305,12 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
#- small transaction will be built based on this selection and depslist.
my @toInstall = pkgs::packagesToInstall($packages);
+ my $time = time;
$ENV{DURING_INSTALL} = 1;
pkgs::install($o->{prefix}, $o->{isUpgrade}, \@toInstall, $packages->[1], $packages->[2]);
+ run_program::rooted($o->{prefix}, 'ldconfig');
delete $ENV{DURING_INSTALL};
+ log::l("Install took: ", formatTime(time - $time));
}
sub afterInstallPackages($) {
@@ -354,9 +357,6 @@ Consoles 1,3,4,7 may also contain interesting information";
#- call update-menus at the end of package installation
run_program::rooted($o->{prefix}, "update-menus");
- #- mainly for auto_install's
- run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall};
-
#- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm.
my $f = "$o->{prefix}/etc/sysconfig/desktop";
if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") {
@@ -924,7 +924,7 @@ sub miscellaneous {
$ENV{SECURE_LEVEL} = $o->{security};
add2hash_ $o, { useSupermount => $o->{security} < 4 && arch() !~ /sparc/ && $o->{installClass} !~ /corporate|server/ };
- cat_("/proc/cmdline") =~ /mem=(\S+)/;
+ cat_("/proc/cmdline") =~ /.mem=(\S+)/; #- if /^mem/, it means that's the value grub gave
add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () });
local $_ = $o->{bootloader}{perImageAppend};