From 1c1afb3e2a397eb906ff0b2884cadf2eb5e4fc02 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 24 Mar 2008 11:00:05 +0000 Subject: * renamed 'bootlog' plugin to 'syslog', as that is what it is going to become, soon git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1680 95ad53e4-c205-0410-b2fa-d234c58c8868 --- .../plugins/bootlog/OpenSLX/OSPlugin/bootlog.pm | 79 ---------------------- .../init-hooks/15-have-ip-config/bootlog.sh | 7 -- .../plugins/syslog/OpenSLX/OSPlugin/syslog.pm | 79 ++++++++++++++++++++++ .../syslog/init-hooks/15-have-ip-config/syslog.sh | 7 ++ 4 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 os-plugins/plugins/bootlog/OpenSLX/OSPlugin/bootlog.pm delete mode 100644 os-plugins/plugins/bootlog/init-hooks/15-have-ip-config/bootlog.sh create mode 100644 os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm create mode 100644 os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh diff --git a/os-plugins/plugins/bootlog/OpenSLX/OSPlugin/bootlog.pm b/os-plugins/plugins/bootlog/OpenSLX/OSPlugin/bootlog.pm deleted file mode 100644 index fab0be95..00000000 --- a/os-plugins/plugins/bootlog/OpenSLX/OSPlugin/bootlog.pm +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) 2008 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# bootlog.pm -# - implementation of the 'bootlog' plugin, which installs -# all needed information for a displaymanager and for the bootlog. -# ----------------------------------------------------------------------------- -package OpenSLX::OSPlugin::bootlog; - -use strict; -use warnings; - -use base qw(OpenSLX::OSPlugin::Base); - -use File::Basename; -use File::Path; - -use OpenSLX::Basics; -use OpenSLX::Utils; - -sub new -{ - my $class = shift; - - my $self = { - name => 'bootlog', - }; - - return bless $self, $class; -} - -sub getInfo -{ - my $self = shift; - - return { - description => unshiftHereDoc(<<' End-of-Here'), - Sets up remote logging of boot process (via UPD). - End-of-Here - mustRunAfter => [], - }; -} - -sub getAttrInfo -{ - my $self = shift; - - return { - 'bootlog::active' => { - applies_to_systems => 1, - applies_to_clients => 1, - description => unshiftHereDoc(<<' End-of-Here'), - should the 'bootlog'-plugin be executed during boot? - End-of-Here - content_regex => qr{^(0|1)$}, - content_descr => '1 means active - 0 means inactive', - default => '1', - }, - 'bootlog::target' => { - applies_to_systems => 1, - applies_to_clients => 1, - description => unshiftHereDoc(<<' End-of-Here'), - ip:port where bootlog shall be sent to - End-of-Here - content_regex => undef, - content_descr => 'allowed: gdm, kdm, xdm', - default => undef, - }, - }; -} - -1; diff --git a/os-plugins/plugins/bootlog/init-hooks/15-have-ip-config/bootlog.sh b/os-plugins/plugins/bootlog/init-hooks/15-have-ip-config/bootlog.sh deleted file mode 100644 index a1a07e8a..00000000 --- a/os-plugins/plugins/bootlog/init-hooks/15-have-ip-config/bootlog.sh +++ /dev/null @@ -1,7 +0,0 @@ -if [ -e /initramfs/plugin-conf/bootlog.conf ]; then - . /initramfs/plugin-conf/bootlog.conf - if [ $bootlog_active -ne 0 ]; then - echo "syslogd -R $bootlog_target..." - syslogd -R $bootlog_target & >/dev/null 2>&1 - fi -fi diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm new file mode 100644 index 00000000..5ded36ee --- /dev/null +++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm @@ -0,0 +1,79 @@ +# Copyright (c) 2008 - OpenSLX GmbH +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# syslog.pm +# - implementation of the 'syslog' plugin, which installs +# all needed information for a displaymanager and for the syslog. +# ----------------------------------------------------------------------------- +package OpenSLX::OSPlugin::syslog; + +use strict; +use warnings; + +use base qw(OpenSLX::OSPlugin::Base); + +use File::Basename; +use File::Path; + +use OpenSLX::Basics; +use OpenSLX::Utils; + +sub new +{ + my $class = shift; + + my $self = { + name => 'syslog', + }; + + return bless $self, $class; +} + +sub getInfo +{ + my $self = shift; + + return { + description => unshiftHereDoc(<<' End-of-Here'), + Sets up remote logging of boot process (via UPD). + End-of-Here + mustRunAfter => [], + }; +} + +sub getAttrInfo +{ + my $self = shift; + + return { + 'syslog::active' => { + applies_to_systems => 1, + applies_to_clients => 1, + description => unshiftHereDoc(<<' End-of-Here'), + should the 'syslog'-plugin be executed during boot? + End-of-Here + content_regex => qr{^(0|1)$}, + content_descr => '1 means active - 0 means inactive', + default => '1', + }, + 'syslog::target' => { + applies_to_systems => 1, + applies_to_clients => 1, + description => unshiftHereDoc(<<' End-of-Here'), + ip:port where syslog shall be sent to + End-of-Here + content_regex => undef, + content_descr => 'allowed: gdm, kdm, xdm', + default => undef, + }, + }; +} + +1; diff --git a/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh b/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh new file mode 100644 index 00000000..a1a07e8a --- /dev/null +++ b/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh @@ -0,0 +1,7 @@ +if [ -e /initramfs/plugin-conf/bootlog.conf ]; then + . /initramfs/plugin-conf/bootlog.conf + if [ $bootlog_active -ne 0 ]; then + echo "syslogd -R $bootlog_target..." + syslogd -R $bootlog_target & >/dev/null 2>&1 + fi +fi -- cgit v1.2.3-55-g7522