summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm6
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm6
-rw-r--r--os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm14
3 files changed, 14 insertions, 12 deletions
diff --git a/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm b/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
index 4fad39d4..1cd5afaa 100644
--- a/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
+++ b/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2009 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -117,6 +117,10 @@ sub installationPhase
$engine->getInstallablePackagesForSelection('qemu-kvm')
);
}
+ # copy run-virt.include to the appropriate place for inclusion in stage4
+ copyFile("$self->{openslxBasePath}/lib/plugins/qemukvm/files/run-virt.include",
+ "$self->{pluginRepositoryPath}/");
+
return;
}
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
index fa676e4a..b863ae7b 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2009 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -117,6 +117,10 @@ sub installationPhase
$engine->getInstallablePackagesForSelection('???')
);
}
+ # copy run-virt.include to the appropriate place for inclusion in stage4
+ copyFile("$self->{openslxBasePath}/lib/plugins/virtualbox/files/run-virt.include",
+ "$self->{pluginRepositoryPath}/");
+
return;
}
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index b322847a..f52365d5 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2008, 2009 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -298,15 +298,9 @@ sub installationPhase
linkFile("/var/X11R6/bin/vmware", "/usr/bin/vmware");
rename("/usr/bin/vmware", "/usr/bin/vmware.slx-bak");
}
- # this kinda sucks. what if we have local installed vmplayer but
- # plugin installed vmware workstation? what if we have a local
- # installed vmware workstation but run plugin installed vmplayer
- # without workstation. Link will go to nowhere... kinda ugly that
- # /usr/ is ro.
- # TODO: need to find a solution (if there is one possible with ro
- # mounted /usr ...)
- linkFile("/var/X11R6/bin/vmware", "/usr/bin/vmware");
-
+ # copy run-virt.include to the appropriate place for inclusion in stage4
+ copyFile("$self->{openslxBasePath}/lib/plugins/vmware/files/run-virt.include",
+ "$self->{pluginRepositoryPath}/");
}
sub removalPhase