diff options
| author | Dirk von Suchodoletz | 2010-08-21 16:23:21 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-08-21 16:23:21 +0200 |
| commit | 12fe486a62ecb966b0c0ef8a98fc7c55f787002b (patch) | |
| tree | 51eb6443dce27747dddac4603a15dab8bc5128b5 | |
| parent | Exclude stuff for newer Suse ... (diff) | |
| parent | remove package-manager stuff of motd (diff) | |
| download | core-12fe486a62ecb966b0c0ef8a98fc7c55f787002b.tar.gz core-12fe486a62ecb966b0c0ef8a98fc7c55f787002b.tar.xz core-12fe486a62ecb966b0c0ef8a98fc7c55f787002b.zip | |
Merge branch 'master' of openslx.org:openslx/core
| -rw-r--r-- | installer/OpenSLX/OSExport/Distro/Ubuntu.pm | 3 | ||||
| -rw-r--r-- | os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm index 566817b8..a1e477d5 100644 --- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm @@ -53,6 +53,9 @@ sub initDistroInfo - /usr/share/vmware/* - /usr/share/autostart/trackerd.desktop - /usr/share/autostart/knetworkmanager.desktop + - /etc/update-motd.d/90* + - /etc/update-motd.d/91* + - /etc/update-motd.d/98* - /tmp/* - /sys/* - /proc/* diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm index 2952f2e7..e19ba627 100644 --- a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm +++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm @@ -127,7 +127,7 @@ sub installationPhase my $engine = $self->{'os-plugin-engine'}; if ($self->{kind} eq 'rsyslog' && !isInPath($self->{distro}->getBinaryName('rsyslog'))) { - $engine->installPackages($self->{distro}->getPackageName('syslog-ng')); + $engine->installPackages($self->{distro}->getPackageName('rsyslog')); } if ($self->{kind} eq 'syslog-ng' && !isInPath('syslog-ng')) { |