* removed 'precedence'-attribute and made it part of the general plugin info -

  it makes no sense to have this configurable by the user

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

11 files changed, 37 insertions, 123 deletions

diff --git a/os-plugins/OpenSLX/OSPlugin/Base.pm b/os-plugins/OpenSLX/OSPlugin/Base.pm
index cede0bce..9d4f6657 100644
--- a/os-plugins/OpenSLX/OSPlugin/Base.pm
+++ b/os-plugins/OpenSLX/OSPlugin/Base.pm
@@ -105,6 +105,25 @@ Returns a hash-ref with administrative information about this plugin (what does
 it do and how does it relate to other plugins). Every plugin needs to provide
 this method and return the information about itself.
 
+The returned hash-ref must include at least the following entries:
+
+=over
+
+=item B<description>
+
+Explains the purpose of this plugins.
+
+=item B<precedence>
+
+Specifies the execution precedence of this plugin with respect to all other
+plugins (plugins with lower precedences will be started before the ones with
+a higher precedence).
+
+Valid values range from 0-99. If your plugin does not have any requirements
+in this context, just specify the default value '50'.
+
+=back
+    
 =cut
 
 sub getInfo
@@ -133,17 +152,6 @@ The returned hash-ref must include at least the following entries:
 
 Indicates whether or not this plugin is active (1 for active, 0 for inactive).
 
-=item B<I<plugin-name>::precedence>
-
-Specifies the execution precedence of this plugin with respect to all other
-plugins (plugins with lower precedences will be started before the ones with
-a higher precedence).
-
-Valid values range from 0-99. If your plugin does not have any requirements
-in this context, just specify the default value '50'.
-
-=back
-    
 =cut
 
 sub getAttrInfo
@@ -155,7 +163,6 @@ sub getAttrInfo
     # of slxconfig.
     return {
         # attribute 'active' is mandatory for all plugins
-        # attribute 'precedence' is mandatory for all plugins
     };
 }
 
@@ -316,7 +323,7 @@ suggestAdditionalKernelModules() and maybe copyRequiredFilesIntoInitramfs().
 sub setupPluginInInitramfs
 {
     my $self                = shift;
-    my $attrs                = shift;
+    my $attrs               = shift;
     my $makeInitRamFSEngine = shift;
 
     my $pluginName      = $self->{name};
@@ -326,8 +333,7 @@ sub setupPluginInInitramfs
     my $initHooksPath   = "$buildPath/etc/init-hooks";
 
     # copy runlevel script
-    my $precedence 
-        = sprintf('%02d', $attrs->{"${pluginName}::precedence"});
+    my $precedence = sprintf('%02d', $self->getInfo()->{precedence});
     my $scriptName = "$pluginSrcPath/$pluginName/XX_${pluginName}.sh";
     my $targetName = "$pluginInitdPath/${precedence}_${pluginName}.sh";
     if (-e $scriptName) {
diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index eba7cb01..1d53fff9 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -41,7 +41,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             Installs Splashy as bootsplash into ramfs and sets a Theme.
         End-of-Here
-        mustRunAfter => [],
+        precedence => 30,
     };
 }
 
@@ -60,16 +60,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        'bootsplash::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'bootsplash' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 30,
-        },
 
         'bootsplash::theme' => {
             applies_to_systems => 1,
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index 84f21e91..046d0759 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -44,7 +44,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             Sets a desktop and creates needed configs, theme can be set as well.
         End-of-Here
-        mustRunAfter => [],
+        precedence => 40,
     };
 }
 
@@ -63,16 +63,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        'desktop::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 1,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'desktop' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 40,
-        },
         'desktop::manager' => {
             applies_to_systems => 1,
             applies_to_clients => 1,
@@ -365,6 +355,7 @@ sub _ensureSensibleStage3Attrs
                 "no desktop kind is possible, plugin 'desktop' wouldn't work!"
             );
         }
+        print _tr("selecting %s as desktop kind\n", $desktops[0]);
         $self->{attrs}->{'desktop::kind'} = $desktops[0];
     }
 
@@ -378,6 +369,7 @@ sub _ensureSensibleStage3Attrs
                 "no desktop manager is possible, plugin 'desktop' wouldn't work!"
             );
         }
+        print _tr("selecting %s as desktop manager\n", $managers[0]);
         $self->{attrs}->{'desktop::manager'} = $managers[0];
     }
 
diff --git a/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm b/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm
index ee1b503b..0da782d1 100644
--- a/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm
+++ b/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm
@@ -43,7 +43,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             Sets a displaymanager and creates needed configs, theme can be set as well.
         End-of-Here
-        mustRunAfter => [],
+        precedence => 50,
     };
 }
 
@@ -62,16 +62,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        'displaymanager::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'displaymanager' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 40,
-        },
         'displaymanager::xdmcp' => {
             applies_to_systems => 1,
             applies_to_clients => 0,
diff --git a/os-plugins/plugins/example/OpenSLX/OSPlugin/example.pm b/os-plugins/plugins/example/OpenSLX/OSPlugin/example.pm
index dad6756c..ae7bb4ef 100644
--- a/os-plugins/plugins/example/OpenSLX/OSPlugin/example.pm
+++ b/os-plugins/plugins/example/OpenSLX/OSPlugin/example.pm
@@ -45,7 +45,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             just an exemplary plugin that prints a smiley when the client boots
         End-of-Here
-        mustRunAfter => [],
+        precedence => 50,
     };
 }
 
@@ -69,17 +69,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        # attribute 'precedence' is mandatory for all plugins
-        'example::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'example' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 50,
-        },
 
         # plugin specific attributes start here ...
         'example::preferred_side' => {
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
index a1a07e8a..8c6218cc 100644
--- 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
@@ -1,7 +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
+if [ -e /initramfs/plugin-conf/syslog.conf ]; then
+    . /initramfs/plugin-conf/syslog.conf
+    if [ $syslog_active -ne 0 ]; then
+        echo "syslogd -R $syslog_target..."
+        syslogd -R $syslog_target & >/dev/null 2>&1
     fi
 fi
diff --git a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
index d4610a4c..1de80d93 100644
--- a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
+++ b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
@@ -44,7 +44,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             Applies a graphical theme to the bootsplash and the displaymanager.
         End-of-Here
-        mustRunAfter => [],
+        precedence => 30,
     };
 }
 
@@ -63,16 +63,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        'theme::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'theme' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 30,
-        },
 
         'theme::splash' => {
             applies_to_systems => 1,
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index b18aaa02..2a4484d8 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -41,7 +41,7 @@ sub getInfo
             allows user to pick from a list of different virtual machine images
             based on xml-files, which tell about available images.
         End-of-Here
-        mustRunAfter => []
+        precedence => 50,
     };
 }
 
@@ -60,16 +60,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        'vmchooser::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 1,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'vmchooser' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 50,
-        },
     };
 }
 
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 1f40f849..6a0493ed 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -43,7 +43,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             !!! descriptive text missing here !!!
         End-of-Here
-        mustRunAfter => [],
+        precedence => 70,
     };
 }
 
@@ -68,17 +68,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        # attribute 'precedence' is mandatory for all plugins
-        'vmware::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'vmware' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => '70',
-        },
         # attribute 'imagesrc' defines where we can find vmware images
         'vmware::imagessrc' => {
             applies_to_systems => 1,
diff --git a/os-plugins/plugins/vmwarebinary/OpenSLX/OSPlugin/vmwarebinary.pm b/os-plugins/plugins/vmwarebinary/OpenSLX/OSPlugin/vmwarebinary.pm
index 5773b1ce..fb7132a2 100644
--- a/os-plugins/plugins/vmwarebinary/OpenSLX/OSPlugin/vmwarebinary.pm
+++ b/os-plugins/plugins/vmwarebinary/OpenSLX/OSPlugin/vmwarebinary.pm
@@ -42,7 +42,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             !!! descriptive text missing here !!!
         End-of-Here
-        mustRunAfter => [],
+        precedence => 70,
     };
 }
 
@@ -66,17 +66,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-        # attribute 'precedence' is mandatory for all plugins
-        'vmwarebinary::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'vmwarebinary' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 70,
-        },
         # attribute 'imagesrc' defines where we can find vmware images
         'vmwarebinary::imagessrc' => {
             applies_to_systems => 1,
diff --git a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm
index 7d34934f..16bf4fe1 100644
--- a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm
+++ b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm
@@ -37,7 +37,7 @@ sub getInfo
         description => unshiftHereDoc(<<'        End-of-Here'),
             enables x11vnc server
         End-of-Here
-        mustRunAfter => [],
+        precedence => 50,
     };
 }
 
@@ -57,17 +57,6 @@ sub getAttrInfo
             default => '1',
         },
 
-        'x11vnc::precedence' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                the execution precedence of the 'x11vnc' plugin
-            End-of-Here
-            content_regex => qr{^\d\d$},
-            content_descr => 'allowed range is from 01-99',
-            default => 50,
-        },
-
         'x11vnc::mode' => {
             applies_to_systems => 1,
             applies_to_clients => 0,