summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins
diff options
context:
space:
mode:
authorOliver Tappe2008-01-27 15:51:47 +0100
committerOliver Tappe2008-01-27 15:51:47 +0100
commitfde7d8f091d03b8d2c0c14e3f56eab700082beba (patch)
treed940abafc4d6b261805cd0cb7b381246ef85b732 /os-plugins/plugins
parent* fixed bug that left orphaned installed_plugins when removing a vendor-OS (diff)
downloadcore-fde7d8f091d03b8d2c0c14e3f56eab700082beba.tar.gz
core-fde7d8f091d03b8d2c0c14e3f56eab700082beba.tar.xz
core-fde7d8f091d03b8d2c0c14e3f56eab700082beba.zip
Hopefully finished the adjustments of the tools with respect to theme
naming and other recent discussions of user interface. * adjusted and simplified code to the fact that plugins are now named in all lowercase * slxos-plugin --verbose list now shows description for each plugin and a list of supported attributes * fixed some outstanding issues with respect to lowercasing of plugin names * Separated theme::name into theme::splash, theme::displaymanager and theme::desktop, leading to DB-schema 0.24. Please note that although these attributes exist, currently only theme::splash is being used (the new ones will be used by the reimplemented mkdxsinitrd) * moved some information gathering from OSPlugin::Engine into OSPlugin::Roster, where it belongs git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1500 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins')
-rw-r--r--os-plugins/plugins/example/XX_example.sh2
-rw-r--r--os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm26
-rw-r--r--os-plugins/plugins/theme/XX_theme.sh2
3 files changed, 25 insertions, 5 deletions
diff --git a/os-plugins/plugins/example/XX_example.sh b/os-plugins/plugins/example/XX_example.sh
index ae8bcd64..d4496102 100644
--- a/os-plugins/plugins/example/XX_example.sh
+++ b/os-plugins/plugins/example/XX_example.sh
@@ -26,7 +26,7 @@
if [ -e /initramfs/plugin-conf/example.conf ]; then
. /initramfs/plugin-conf/example.conf
- if [ $Example_active -ne 0 ]; then
+ if [ $example_active -ne 0 ]; then
[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'example' os-plugin ...";
# for this example plugin, we simply take a filename from the
diff --git a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
index 17170fbf..c6635ccb 100644
--- a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
+++ b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
@@ -40,7 +40,7 @@ sub getInfo
return {
description => unshiftHereDoc(<<' End-of-Here'),
- applies a graphical theme to the bootsplash and the displaymanager
+ Applies a graphical theme to the bootsplash and the displaymanager.
End-of-Here
mustRunAfter => [],
};
@@ -78,11 +78,31 @@ sub getAttrInfo
default => 30,
},
- 'theme::name' => {
+ 'theme::splash' => {
applies_to_systems => 1,
applies_to_clients => 0,
description => unshiftHereDoc(<<' End-of-Here'),
- the name of the theme to apply (or unset for no theme)
+ name of the theme to apply to bootsplash (unset for no theme)
+ End-of-Here
+ content_regex => undef,
+ content_descr => undef,
+ default => 'openslx',
+ },
+ 'theme::displaymanager' => {
+ applies_to_systems => 1,
+ applies_to_clients => 0,
+ description => unshiftHereDoc(<<' End-of-Here'),
+ name of the theme to apply to displaymanager (unset for no theme)
+ End-of-Here
+ content_regex => undef,
+ content_descr => undef,
+ default => 'openslx',
+ },
+ 'theme::desktop' => {
+ applies_to_systems => 1,
+ applies_to_clients => 0,
+ description => unshiftHereDoc(<<' End-of-Here'),
+ name of the theme to apply to desktop (unset for no theme)
End-of-Here
content_regex => undef,
content_descr => undef,
diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh
index 4d166c13..2d2b0f0f 100644
--- a/os-plugins/plugins/theme/XX_theme.sh
+++ b/os-plugins/plugins/theme/XX_theme.sh
@@ -6,7 +6,7 @@
. /etc/sysconfig/config
if [ -e /initramfs/plugin-conf/theme.conf ]; then
. /initramfs/plugin-conf/theme.conf
- if [ $Theme_active -ne 0 ]; then
+ if [ $theme_active -ne 0 ]; then
[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'theme' os-plugin ...";
testmkd /mnt/var/lib/openslx/themes/displaymanager