diff options
| author | root | 2010-04-13 15:49:09 +0200 |
|---|---|---|
| committer | root | 2010-04-13 15:49:09 +0200 |
| commit | 91c3a8df4be49fba4c7398413e15fc9868b94bd0 (patch) | |
| tree | 7305f330b58eed9a0d9bd01b20ca0efbe8b4f23d /os-plugins/plugins/pvs | |
| parent | fix pbs stuff (diff) | |
| parent | virtualization plugin, now with calculation of mem, run-vmgrid and run-virt u... (diff) | |
| download | core-91c3a8df4be49fba4c7398413e15fc9868b94bd0.tar.gz core-91c3a8df4be49fba4c7398413e15fc9868b94bd0.tar.xz core-91c3a8df4be49fba4c7398413e15fc9868b94bd0.zip | |
Merge branch 'master' of git@openslx.org:openslx/core
Diffstat (limited to 'os-plugins/plugins/pvs')
| -rw-r--r-- | os-plugins/plugins/pvs/OpenSLX/OSPlugin/pvs.pm | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/pvs/XX_pvs.sh | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/os-plugins/plugins/pvs/OpenSLX/OSPlugin/pvs.pm b/os-plugins/plugins/pvs/OpenSLX/OSPlugin/pvs.pm index 6a6c7a8e..d0a629e4 100644 --- a/os-plugins/plugins/pvs/OpenSLX/OSPlugin/pvs.pm +++ b/os-plugins/plugins/pvs/OpenSLX/OSPlugin/pvs.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2009 - OpenSLX GmbH +# Copyright (c) 2009..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING diff --git a/os-plugins/plugins/pvs/XX_pvs.sh b/os-plugins/plugins/pvs/XX_pvs.sh index e96f5a63..9a86574f 100644 --- a/os-plugins/plugins/pvs/XX_pvs.sh +++ b/os-plugins/plugins/pvs/XX_pvs.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2009 - RZ Uni Freiburg -# Copyright (c) 2009 - OpenSLX GmbH +# Copyright (c) 2009..2010 - RZ Uni Freiburg +# Copyright (c) 2009..2010 - OpenSLX GmbH # # This program/file is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -21,20 +21,20 @@ if [ -e /initramfs/plugin-conf/pvs.conf ]; then . /initramfs/plugin-conf/pvs.conf if [ $pvs_active -ne 0 ]; then [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'pvs' os-plugin ..."; - # configure central pvs client configuration file - testmkdi /mnt/etc/pvs + # location of central pvs configuration files + testmkdi /mnt/etc/openslx/pvs # add it to the Xserver script (?) # link the executables - for tool in poolVS poolVSClient VNCwrapper ; do - ln -s /opt/openslx/plugin-repo/pvs/${tool} /mnt/var/X11R6/bin/${tool} - done + #for tool in poolVS poolVSClient VNCwrapper ; do + # ln -s /opt/openslx/plugin-repo/pvs/${tool} /mnt/var/X11R6/bin/${tool} + #done # write config file - echo "# parameters generated by $0" > /mnt/etc/pvs/pvs.conf - echo "pvs_PARAMS=\"$PARAMS\"" >> /mnt/etc/pvs/pvs.conf - echo "pvs_X11=\"$pvs_X11\"" >> /mnt/etc/pvs/pvs.conf + #echo "# parameters generated by $0" > /mnt/etc/pvs/pvs.conf + #echo "pvs_PARAMS=\"$PARAMS\"" >> /mnt/etc/pvs/pvs.conf + #echo "pvs_X11=\"$pvs_X11\"" >> /mnt/etc/pvs/pvs.conf [ $DEBUGLEVEL -gt 0 ] && echo "done with 'pvs' os-plugin ..."; |