Proper (single) packet selection for installation (untested) ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3008 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 37 insertions, 6 deletions

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}) {
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
index 278ccf14..3184950e 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
@@ -49,6 +49,29 @@ sub fillRunlevelScript
     my $self     = shift;
     my $location = shift;
     my $kind     = shift;
+/*
+    my $initfile = newInitFile();
+    $initfile->addFunction(
+	'load_modules',
+        '
+         # to be filled in via the stage1 configuration script
+         insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1
+         insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1
+         insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0
+        '
+        {param => "value"}
+    );
+
+    $initfile->addFunctionCall(
+	'functionName',
+        'start', # name of block
+        {priority => 5, }
+    );
+
+    $initfile->addDaemon("/bin/mydaemon");
+
+    my $runlevelscript = getInitFileForDistro($initfile, "ubuntu");
+*/
 
     my $script = unshiftHereDoc(<<"    End-of-Here");
         #!/bin/sh