summaryrefslogtreecommitdiffstats
path: root/config-db/slxconfig-demuxer
diff options
context:
space:
mode:
authorOliver Tappe2008-01-27 15:51:47 +0100
committerOliver Tappe2008-01-27 15:51:47 +0100
commitfde7d8f091d03b8d2c0c14e3f56eab700082beba (patch)
treed940abafc4d6b261805cd0cb7b381246ef85b732 /config-db/slxconfig-demuxer
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 'config-db/slxconfig-demuxer')
-rwxr-xr-xconfig-db/slxconfig-demuxer9
1 files changed, 4 insertions, 5 deletions
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index 24501a97..c715caac 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -498,7 +498,7 @@ sub generateInitialRamFS
$cmd .= "-S $info->{name} ";
# pass on theme, if any
- my $theme = $attrs->{'theme::name'} || '';
+ my $theme = $attrs->{'theme::splash'} || '';
if (length $theme) {
$cmd .= "-s $theme ";
}
@@ -705,8 +705,7 @@ sub writePluginConfigurationsForSystem
vlog(2, _tr("checking configuration of plugin '%s'", $pluginName));
# skip inactive plugins
- my $pluginScope = lc($pluginName);
- next unless $attrs->{"${pluginScope}::active"};
+ next unless $attrs->{"${pluginName}::active"};
push @activePlugins, $pluginName;
@@ -717,7 +716,7 @@ sub writePluginConfigurationsForSystem
vlog(2, _tr("writing configuration file for plugin '%s'", $pluginName));
# write plugin configuration to a file:
my $content;
- my @pluginAttrs = grep { $_ =~ m{^${pluginScope}::} } keys %$attrs;
+ my @pluginAttrs = grep { $_ =~ m{^${pluginName}::} } keys %$attrs;
foreach my $attr (sort @pluginAttrs) {
my $attrVal = $attrs->{$attr};
next if !defined $attrVal;
@@ -734,7 +733,7 @@ sub writePluginConfigurationsForSystem
# copy runlevel script to be used in stage3:
my $precedence
- = sprintf('%02d', $attrs->{"${pluginScope}::precedence"});
+ = sprintf('%02d', $attrs->{"${pluginName}::precedence"});
my $pluginFolder
= "$openslxConfig{'base-path'}/lib/plugins/$pluginName";
my $scriptName = "$pluginFolder/XX_${pluginName}.sh";