Stuff needed for plugins to run properly in stage3 ...

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

3 files changed, 16 insertions, 25 deletions

diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index a10808d6..a6c1aeb3 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -11,6 +11,8 @@
 #
 # General information about OpenSLX can be found at http://openslx.org
 #
+. /etc/functions
+. /etc/distro-functions
 
 # TODO: nvram,functions
 # write /etc/vmware/config (if a non-standard location of vmware basedir is
@@ -164,11 +166,9 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
           # autodetected here ... (vmimgserv is blockdev here)
           vmbdev=/dev/${vmimgserv}
           waitfor ${vmbdev} 20000
-          echo "ext2"     > /etc/filesystems
-          echo "reiserfs" >> /etc/filesystems
-          echo "vfat"     >> /etc/filesystems
-          echo "xfs"      >> /etc/filesystems
-          mount -o ro ${vmbdev} /mnt/var/lib/vmware || error "$scfg_evmlm" nonfatal
+          echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems
+          mount -o ro ${vmbdev} /mnt/var/lib/vmware || \
+            error "$scfg_evmlm" nonfatal
           ;;
         *)
           # we expect nfs mounts here ...
@@ -251,14 +251,12 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
     fi
 
     # write version information for image problem (v2 images don't run
-    # on v1 players
+    # on v1 players)
     if [ "${vmware_kind}" = "vmpl1.0" ]; then
       echo "vmplversion=1" > /mnt/etc/vmware/version
-    fi
-    if [ "${vmware_kind}" = "vmpl2.0" ]; then
+    elif [ "${vmware_kind}" = "vmpl2.0" ]; then
       echo "vmplversion=2" > /mnt/etc/vmware/version
-    fi
-    if [ "${vmware_kind}" = "local" ]; then
+    elif [ "${vmware_kind}" = "local" ]; then
       version=$(strings /usr/lib/vmware/bin/vmplayer|head -n 1|cut -c 1)
       echo "vmplversion=${version}" > /mnt/etc/vmware/version
     fi
diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
index 3bc34914..5cc8dcfc 100644
--- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
@@ -42,10 +42,10 @@ sub getInfo
 
     return {
         description => unshiftHereDoc(<<'        End-of-Here'),
-		This plugin tries to integrate binary graphics drivers into the system.
-		Notice that you need to have kernel-headers installed to work properly.
+        This plugin tries to integrate binary graphics drivers into the system.
+        Notice that you need to have kernel-headers installed to work properly.
         End-of-Here
-        precedence => 50,
+        precedence => 80,
     };
 }
 
@@ -63,7 +63,7 @@ sub getAttrInfo
             applies_to_systems => 1,
             applies_to_clients => 0,
             description => unshiftHereDoc(<<'            End-of-Here'),
-                should the 'example'-plugin be executed during boot?
+            should the 'xserver'-plugin be executed during boot?
             End-of-Here
             content_regex => qr{^(0|1)$},
             content_descr => '1 means active - 0 means inactive',
@@ -71,17 +71,7 @@ sub getAttrInfo
         },
 
         # plugin specific attributes start here ...
-        'xserver::preferred_side' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                determines to which side you have to tilt your head in order
-                to read the smiley
-            End-of-Here
-            content_regex => qr{^(left|right)$},
-            content_descr => q{'left' will print ';-)' - 'right' will print '(-;'},
-            default => 'left',
-        },
+
     };
 }
 
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 4f2c4c0f..36a28ffc 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -13,6 +13,9 @@
 #
 # stage3 part of 'xserver' plugin - the runlevel script setting up the Xorg
 # configuration and checking for 3D capabilities and non-gpl drivers
+#
+. /etc/functions
+. /etc/distro-functions
 
 xfc="/mnt/etc/X11/xorg.conf"