diff options
| author | Dirk von Suchodoletz | 2008-08-05 22:24:48 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-08-05 22:24:48 +0200 |
| commit | 74f8eb1aee093bc330c52fa0482aebf05d3282dd (patch) | |
| tree | 812963f12a84cb0d38114678e16879b6c6f50215 /os-plugins | |
| parent | Stuff needed for plugins to run properly in stage3 ... (diff) | |
| download | core-74f8eb1aee093bc330c52fa0482aebf05d3282dd.tar.gz core-74f8eb1aee093bc330c52fa0482aebf05d3282dd.tar.xz core-74f8eb1aee093bc330c52fa0482aebf05d3282dd.zip | |
Small dirty bug in XX_vmware.sh fixed (-p is unknown to testmkd)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1964 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 8 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index a6c1aeb3..4f17593f 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -1,5 +1,3 @@ -#!/bin/ash -# # Copyright (c) 2007..2008 - RZ Uni Freiburg # Copyright (c) 2008 - OpenSLX GmbH # @@ -11,8 +9,8 @@ # # General information about OpenSLX can be found at http://openslx.org # -. /etc/functions -. /etc/distro-functions +# script is included from init via the "." load function - thus it has all +# variables and functions available # TODO: nvram,functions # write /etc/vmware/config (if a non-standard location of vmware basedir is @@ -36,7 +34,7 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then if [ -d /mnt/etc/vmware ] ; then rm -rf /mnt/etc/vmware/* else - testmkd -p /mnt/etc/vmware + testmkd /mnt/etc/vmware fi # write the /etc/vmware/slxvmconfig file # check for the several variables and write the several files: diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 36a28ffc..c2aafdad 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -1,5 +1,3 @@ -#!/bin/ash -# # Copyright (c) 2008 - RZ Uni Freiburg # Copyright (c) 2008 - OpenSLX GmbH # @@ -14,8 +12,8 @@ # 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 +# script is included from init via the "." load function - thus it has all +# variables and functions available xfc="/mnt/etc/X11/xorg.conf" |