diff options
| author | Oliver Tappe | 2007-02-21 15:18:13 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2007-02-21 15:18:13 +0100 |
| commit | b786882a709ad7942b4af7eef3d6307edfc91ca8 (patch) | |
| tree | 8420be0b0114886821d071dab7690caae3aaaef1 /installer/OpenSLX/OSSetup/Engine.pm | |
| parent | Fix for debug=0 ... (< /dev/null) (diff) | |
| download | core-b786882a709ad7942b4af7eef3d6307edfc91ca8.tar.gz core-b786882a709ad7942b4af7eef3d6307edfc91ca8.tar.xz core-b786882a709ad7942b4af7eef3d6307edfc91ca8.zip | |
* slxos-setup und die Metadaten der Systeme aktualisiert
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@704 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Engine.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 52093cbd..f07689f9 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -26,7 +26,7 @@ use vars qw(%supportedDistros); %supportedDistros = ( # 'debian-3.1' => 'Debian_3_1', # 'debian-4.0' => 'Debian_4_0', -# 'fedora-6' => 'Fedora_6', + 'fedora-6' => 'Fedora_6', # 'fedora-6-x86_64' => 'Fedora_6_x86_64', # 'mandriva-2007.0' => 'Mandriva_2007_0', # 'suse-9.3' => 'SUSE_9_3', @@ -35,7 +35,7 @@ use vars qw(%supportedDistros); 'suse-10.1' => 'SUSE_10_1', # 'suse-10.1-x86_64' => 'SUSE_10_1_x86_64', 'suse-10.2' => 'SUSE_10_2', -# 'suse-10.2-x86_64' => 'SUSE_10_2_x86_64', + 'suse-10.2-x86_64' => 'SUSE_10_2_x86_64', # 'ubuntu-6.10' => 'Ubuntu_6_10', ); @@ -190,7 +190,7 @@ sub readDistroInfo if (-e $file) { vlog 3, "reading configuration file $file..."; my $config = slurpFile($file); - if (!eval $config) { + if (!eval $config && length($@)) { die _tr("error in config-file <%s> (%s)", $file, $@)."\n"; } } @@ -394,7 +394,9 @@ sub stage1A_copyTrustedPackageKeys my $stage1cDir = "$stage1bDir/$self->{'stage1cSubdir'}"; my $keyDir = "$self->{'distro-info-dir'}/trusted-package-keys"; - copyFile("$keyDir/pubring.gpg", "$stage1cDir/usr/lib/rpm/gnupg"); + if (-e "$keyDir/pubring.gpg") { + copyFile("$keyDir/pubring.gpg", "$stage1cDir/usr/lib/rpm/gnupg"); + } } sub stage1A_createRequiredFiles @@ -548,7 +550,16 @@ sub stage1D_installPackageSelection { my $self = shift; - vlog 1, "installing package selection..."; + my $selectionName = 'default'; + + vlog 1, "installing package selection <$selectionName>..."; + my $pkgSelection = $self->{'distro-info'}->{selection}->{$selectionName}; + my @pkgs + = grep { length($_) > 0 } + map { $_ =~ s[^\s*(.+?)\s*$][$1]; $_ } + split "\n", $pkgSelection; + $self->{'meta-packager'}->installSelection(join " ", @pkgs); + } ################################################################################ |