summaryrefslogtreecommitdiffstats
path: root/perl-install/install/steps.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:28:15 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:28:15 +0000
commit6ec419f4e25777745f4f17bfa1a38927c9b1be6b (patch)
tree3cd038205cb33e037e497fb66b5607103dba172b /perl-install/install/steps.pm
parent93405ff7d31d80226cd3cd791a3ae772da5e46e0 (diff)
downloaddrakx-6ec419f4e25777745f4f17bfa1a38927c9b1be6b.tar
drakx-6ec419f4e25777745f4f17bfa1a38927c9b1be6b.tar.gz
drakx-6ec419f4e25777745f4f17bfa1a38927c9b1be6b.tar.bz2
drakx-6ec419f4e25777745f4f17bfa1a38927c9b1be6b.tar.xz
drakx-6ec419f4e25777745f4f17bfa1a38927c9b1be6b.zip
(parse_args,empty_packages) add support for 'justdb' option
(for fast testing; warning: no coverage for %post scripts errors or missing requires, non explicit file conflicts, ...) (installPackages) don't try to run ldconfig in 'justdb' mode (configureNetwork) don't try to set firewall, file tests will fail (afterInstallPackages) don't check for file
Diffstat (limited to 'perl-install/install/steps.pm')
-rw-r--r--perl-install/install/steps.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 85de324cb..1d0822dee 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -442,7 +442,7 @@ sub installPackages {
}
any::writeandclean_ldsoconf($::prefix);
- run_program::rooted_or_die($::prefix, 'ldconfig');
+ run_program::rooted_or_die($::prefix, 'ldconfig') if !$o->{justdb};
log::l("Install took: ", formatTimeRaw(time() - $time));
install::media::log_sizes();
@@ -459,7 +459,7 @@ Either your cdrom drive or your cdrom is defective.
Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"
") if any { m|read failed: Input/output error| } cat_("$::prefix/root/drakx/install.log");
- if (arch() !~ /^sparc/) { #- TODO restore it as may be needed for sparc
+ if (arch() !~ /^sparc/ && !$o->{justdb}) { #- TODO restore it as may be needed for sparc
-x "$::prefix/usr/bin/dumpkeys" or $::testing or die
"Some important packages did not get installed properly.
@@ -644,7 +644,8 @@ sub configureNetwork {
my ($o) = @_;
require network::network;
network::network::configure_network($o->{net}, $o, $o->{modules_conf});
- configure_firewall($o) if !$o->{isUpgrade};
+
+ configure_firewall($o) if !$o->{isUpgrade} && !$o->{justdb};
#- only a http proxy can be used by stage1
#- the method is http even for ftp connections through a http proxy