Cleanups for some plugins ...

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

3 files changed, 35 insertions, 47 deletions

diff --git a/os-plugins/plugins/example/XX_example.sh b/os-plugins/plugins/example/XX_example.sh
index d4496102..dedcfc97 100644
--- a/os-plugins/plugins/example/XX_example.sh
+++ b/os-plugins/plugins/example/XX_example.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/ash
 #
 # stage3 part of 'example' plugin - the runlevel script
 #
@@ -25,14 +25,14 @@
 # to: ot@openslx.com, or join the IRC-channel '#openslx' (on freenode).
 
 if [ -e /initramfs/plugin-conf/example.conf ]; then
-	. /initramfs/plugin-conf/example.conf
-	if [ $example_active -ne 0 ]; then
-		[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'example' os-plugin ...";
+  . /initramfs/plugin-conf/example.conf
+  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 
-		# configuration and cat that file (output the smiley):
-		cat /mnt/opt/openslx/plugin-repo/example/$preferred_side
+    # for this example plugin, we simply take a filename from the 
+    # configuration and cat that file (output the smiley):
+    cat /mnt/opt/openslx/plugin-repo/example/$preferred_side
 
-		[ $DEBUGLEVEL -gt 0 ] && echo "done with 'example' os-plugin ...";
-	fi
+    [ $DEBUGLEVEL -gt 0 ] && echo "done with 'example' os-plugin ...";
+  fi
 fi
diff --git a/os-plugins/plugins/xserver/XX_bindrivers.sh b/os-plugins/plugins/xserver/XX_bindrivers.sh
deleted file mode 100644
index 9ac95a56..00000000
--- a/os-plugins/plugins/xserver/XX_bindrivers.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-#
-# stage3 part of 'example' plugin - the runlevel script
-#
-# This basically is a runlevel script (just like you know them from 'init'),
-# whose purpose is to activate the plugin in stage3. The 'XX' at the beginning 
-# of the filename will be replaced with a runlevel precedence number taken 
-# from the configuration of the respective plugin. All plugin runlevel scripts 
-# will be executed in the order of those precedence numbers.
-#
-# In order to activate the corresponding plugin, each runlevel script should:
-#
-# a) read the corresponding configuration file (in this case: 
-#    /initramfs/plugin-conf/example.conf)
-#
-# b) analyse the client (look at the available hardware) and decide what
-#    needs to be done, taking into account the settings given in the config 
-#    file
-#
-# c) activate the plugin by copying/linking appropriate plugin-specific files 
-#    (in this case: from /mnt/opt/openslx/plugins/example/), load required kernel
-#    modules and whatever else might be necessary.
-#
-# if you have any questions regarding the use of this file, please drop a mail
-# to: ot@openslx.com, or join the IRC-channel '#openslx' (on freenode).
-
-if [ -e /initramfs/plugin-conf/example.conf ]; then
-	. /initramfs/plugin-conf/example.conf
-	if [ $example_active -ne 0 ]; then
-		[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'bindrivers' os-plugin ...";
-
-		# for this example plugin, we simply take a filename from the 
-		# configuration and cat that file (output the smiley):
-		cat /mnt/opt/openslx/plugin-repo/example/$preferred_side
-
-		[ $DEBUGLEVEL -gt 0 ] && echo "done with 'bindrivers' os-plugin ...";
-	fi
-fi
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
new file mode 100644
index 00000000..95d7afc2
--- /dev/null
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -0,0 +1,26 @@
+#!/bin/ash
+#
+# Copyright (c) 2008 - RZ Uni Freiburg
+# Copyright (c) 2008 - OpenSLX GmbH
+#
+# This program/file 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 feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org
+#
+# stage3 part of 'xserver' plugin - the runlevel script setting up the Xorg
+# configuration and checking for 3D capabilities and non-gpl drivers
+
+if [ -e /initramfs/plugin-conf/xserver.conf ]; then
+  . /initramfs/plugin-conf/xserver.conf
+  if [ $example_active -ne 0 ]; then
+    [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'xserver' os-plugin ...";
+    
+
+
+    [ $DEBUGLEVEL -gt 0 ] && echo "done with 'bindrivers' os-plugin ...";
+  fi
+fi