From d592140bf91c11fc6c57db55d19001ac9ec17679 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Thu, 16 Jul 2009 16:53:17 +0000 Subject: Proper (single) packet selection for installation (untested) ... git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3008 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm | 12 ++++++++++++ os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm | 8 ++------ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'os-plugins/plugins/syslog/OpenSLX') diff --git a/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm b/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm index b7afec61..409e3a68 100644 --- a/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm @@ -63,4 +63,16 @@ sub runlevelInfo return $rlInfo; } +sub getPackageName +{ + my $self = shift; + my $name = shift; + + my %nameMap = ( + 'syslogd' => 'sysklogd', + 'syslog-ng' => 'syslog-ng', + ); + return $nameMap($name); +} + 1; diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm index 8b214590..6645f9ef 100644 --- a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm +++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm @@ -127,15 +127,11 @@ sub installationPhase my $engine = $self->{'os-plugin-engine'}; if ($self->{kind} eq 'syslog-ng' && !isInPath('syslog-ng')) { - $engine->installPackages( - $engine->getInstallablePackagesForSelection('syslog-ng') - ); + $engine->installPackages($self->{distro}->getPackageName('syslog-ng')); } # not sure if we ever should setup this service if ($self->{kind} eq 'syslogd' && !isInPath('syslog')) { - $engine->installPackages( - $engine->getInstallablePackagesForSelection('syslog') - ); + $engine->installPackages($self->{distro}->getPackageName('syslogd')); } if (!$self->{kind}) { -- cgit v1.2.3-55-g7522