summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-08 01:48:28 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-08 01:48:28 +0000
commit0f16f9693f47687136e5058916d0d04dcb611217 (patch)
tree621a0c76850737d6353385ece3f3fda54219f7b0 /perl-install/install_any.pm
parent83e615434cf1bc3a692ab95b9b8aac3af6c366c8 (diff)
downloaddrakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar.gz
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar.bz2
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar.xz
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 34540d103..ed87b688a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -129,6 +129,8 @@ sub setPackages($) {
$o->{compssUsers} = pkgs::readCompssUsers($o->{packages}, $o->{compss});
push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP();
push @{$o->{base}}, "kernel-pcmcia-cs" if $o->{pcmcia};
+
+ grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages";
} else {
$_->{selected} = 0 foreach values %{$o->{packages}};
}
@@ -375,7 +377,7 @@ sub auto_inst_file() { "$::o->{prefix}/root/auto_inst.cfg.pl" }
sub g_auto_install(;$) {
my ($f) = @_; $f ||= auto_inst_file;
- my $o = bless {};
+ my $o = {};
$o->{default_packages} = [ map { $_->{name} } grep { $_->{selected} && !$_->{base} } values %{$::o->{packages}} ];
@@ -428,5 +430,5 @@ sub pkg_install {
sub fsck_option() {
my $y = $::o->{security} < 3 && $::beginner && "-y ";
- substInFile { s/^(\s*fsckoptions=)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit";
+ substInFile { s/^(\s*fsckoptions="?)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit";
}