diff options
| author | Dirk | 2014-05-02 20:40:55 +0200 |
|---|---|---|
| committer | Dirk | 2014-05-02 20:40:55 +0200 |
| commit | 33709c66a68d98c8cf8c19f87a759aad4765be97 (patch) | |
| tree | 70087c0f0c0e4d03f854e2f9ac2b7466f58a5fcd | |
| parent | Fix for vmware.pm module ... (diff) | |
| download | core-33709c66a68d98c8cf8c19f87a759aad4765be97.tar.gz core-33709c66a68d98c8cf8c19f87a759aad4765be97.tar.xz core-33709c66a68d98c8cf8c19f87a759aad4765be97.zip | |
Minor fixes for virtualization tools ...
| -rw-r--r-- | src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm | 6 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm index d07cd92f..054767e7 100644 --- a/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm +++ b/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm @@ -1,5 +1,5 @@ # Copyright (c) 2009..2010 - RZ Uni Freiburg -# Copyright (c) 2009..2012 - OpenSLX GmbH +# Copyright (c) 2009..2014 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -210,11 +210,11 @@ sub _writeRunlevelScript ); $initfile->addFunction( 'start', - ' modprobe -qa vboxdrv vboxnetflt vboxnetadp', + ' modprobe -qa vboxdrv vboxnetflt vboxnetadp vboxpci', ); $initfile->addFunction( 'stop', - ' rmmod vboxnetadp vboxnetflt vboxdrv', + ' rmmod vboxpci vboxnetadp vboxnetflt vboxdrv', ); $initfile->addToCase( 'start', diff --git a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 80426a31..930fcccb 100644 --- a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -343,13 +343,7 @@ sub _writeRunlevelScript location="$vmpath/usr/bin" if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir - End-of-Here - if ($kind eq 'local10' || $kind eq 'local20') { - $script .= " \$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; - } else { - $script .= " \$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n"; - } - $script .= unshiftHereDoc(<<" End-of-Here"); + \$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n fi if [ -n "\$vmnet1" ] ; then \$location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\ |