Further cleanup in the plugin files ...

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

4 files changed, 36 insertions, 20 deletions

diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
index 13b022cc..0f973653 100644
--- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
@@ -1,5 +1,3 @@
-#!/bin/ash
-#
 # Copyright (c) 2007..2008 - RZ Uni Freiburg
 # Copyright (c) 2008 - OpenSLX GmbH
 #
@@ -13,9 +11,9 @@
 #
 # stage3 part of 'bootsplash' plugin - the runlevel script
 #
-. /etc/functions
-. /etc/distro-functions
-[ -d /etc/sysconfig ] && . /etc/sysconfig/config
+# script is included from init via the "." load function - thus it has all
+# variables and functions available
+
 if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then
   . /initramfs/plugin-conf/bootsplash.conf
   if [ $bootsplash_active -ne 0 ]; then
diff --git a/os-plugins/plugins/syslog/XX_syslog.sh b/os-plugins/plugins/syslog/XX_syslog.sh
index ccd27bbf..1a33bf4f 100644
--- a/os-plugins/plugins/syslog/XX_syslog.sh
+++ b/os-plugins/plugins/syslog/XX_syslog.sh
@@ -1,18 +1,31 @@
-#! /bin/ash
+# Copyright (c) 2007..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 'syslog' plugin - the runlevel script
 #
-. /etc/functions
-. /etc/distro-functions
-. /etc/sysconfig/config
+# script is included from init via the "." load function - thus it has all
+# variables and functions available
+
+# check if the plugin config directory is generally available or if the client
+# configuration failed somehow
+[ -d /initramfs/plugin-conf ] && error "${init_picfg}" nonfatal
+
 if [ -e /initramfs/plugin-conf/syslog.conf ]; then
   . /initramfs/plugin-conf/syslog.conf
   if [ $syslog_active -ne 0 ]; then
-    [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'syslog' os-plugin ...";
+    [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'syslog' os-plugin ..."
   
     . /mnt/opt/openslx/plugin-repo/syslog/syslog.sh
 
-    [ $DEBUGLEVEL -gt 0 ] && echo "done with 'syslog' os-plugin ...";
+    [ $DEBUGLEVEL -gt 0 ] && echo "done with 'syslog' os-plugin ..."
 
   fi
 fi
diff --git a/os-plugins/plugins/x11vnc/XX_x11vnc.sh b/os-plugins/plugins/x11vnc/XX_x11vnc.sh
index 16327b0a..3efe8948 100644
--- a/os-plugins/plugins/x11vnc/XX_x11vnc.sh
+++ b/os-plugins/plugins/x11vnc/XX_x11vnc.sh
@@ -12,9 +12,9 @@
 # script is included from init via the "." load function - thus it has all
 # variables and functions available
 
-[ -e /etc/functions ]        && . /etc/functions
-[ -e /etc/distro-functions ] && . /etc/distro-functions
-[ -d /etc/sysconfig ] && . /etc/sysconfig/config
+# check if the plugin config directory is generally available or if the client
+# configuration failed somehow
+[ -d /initramfs/plugin-conf ] && error "${init_picfg}" nonfatal
 
 if [ -e /initramfs/plugin-conf/x11vnc.conf ]; then
   . /initramfs/plugin-conf/x11vnc.conf
diff --git a/os-plugins/plugins/xen/XX_xen.sh b/os-plugins/plugins/xen/XX_xen.sh
index 4a86c9cc..ba2c4f00 100644
--- a/os-plugins/plugins/xen/XX_xen.sh
+++ b/os-plugins/plugins/xen/XX_xen.sh
@@ -14,11 +14,16 @@
 # script is included from init via the "." load function - thus it has all
 # variables and functions available
 
-testmkd /mnt/var/log/xen
-testmkd /mnt/var/run/xend
-testmkd /mnt/var/run/xenstored
+if [ -e /initramfs/plugin-conf/xen.conf ]; then
+  . /initramfs/plugin-conf/xen.conf
+  if [ $xen_active -ne 0 ]; then
+    testmkd /mnt/var/log/xen
+    testmkd /mnt/var/run/xend
+    testmkd /mnt/var/run/xenstored
 
-rllinker "xendomains" 14 8
-rllinker "xend" 13 9
+    rllinker "xendomains" 14 8
+    rllinker "xend" 13 9
 
-modprobe loop max_loop=64
+    modprobe loop max_loop=64
+  fi
+fi