diff options
author | Dirk von Suchodoletz | 2008-03-21 15:28:58 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2008-03-21 15:28:58 +0100 |
commit | ee7ee5f951463ac421d3db22522d378a202fbb51 (patch) | |
tree | 8f2c8e7d756096f1fe50674f944a7d914584c65f /os-plugins | |
parent | Busybox built with support for the ipcalc applet (replacing the old (diff) | |
download | core-ee7ee5f951463ac421d3db22522d378a202fbb51.tar.gz core-ee7ee5f951463ac421d3db22522d378a202fbb51.tar.xz core-ee7ee5f951463ac421d3db22522d378a202fbb51.zip |
Some changes for the vmware plugin to integrate properly ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1667 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 22 | ||||
-rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 38 | ||||
-rwxr-xr-x | os-plugins/plugins/vmware/files/vmware-init (renamed from os-plugins/plugins/vmware/files/vmware-startscript) | 0 |
3 files changed, 26 insertions, 34 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index ab975506..4ccb5850 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -18,6 +18,7 @@ use warnings; use base qw(OpenSLX::OSPlugin::Base); +use File::Basename; use File::Path; use OpenSLX::Basics; @@ -98,7 +99,7 @@ sub getAttrInfo to the ethernet the host is connected to) be enabled End-of-Here content_descr => 'Allowed values: 0 or 1', - default => '', + default => '1', }, # attribute 'vmnet1' defines if the host connection network mode # should be switched on and NAT should be enabled @@ -110,7 +111,7 @@ sub getAttrInfo Format ServerIP/Netprefix,NAT enables NAT/Masquerading End-of-Here content_descr => 'Allowed value: IP/Prefix[,NAT]', - default => '', + default => '192.168.101.1/24,NAT', }, # attribute 'vmnet8' defines if vmware specific NATed network mode # should be switched on @@ -121,7 +122,7 @@ sub getAttrInfo Format ServerIP/Netprefix End-of-Here content_descr => 'Allowed value: IP/Prefix', - default => '', + default => '192.168.102.1/24', }, # is to be discussed how to handle this - there is no single set of # vmware files!! @@ -145,17 +146,19 @@ sub getAttrInfo sub installationPhase { my $self = shift; - my $pluginRepositoryPath = shift; - my $pluginTempPath = shift; - my $openslxPath = shift; + + $self->{pluginRepositoryPath} = shift; + $self->{pluginTempPath} = shift; + $self->{openslxPath} = shift; + $self->{attrs} = shift; # get path of files we need to install - my $pluginFilesPath = "$openslxPath/lib/plugins/$self->{'name'}/files"; + my $pluginFilesPath = "$self->{'openslxPath'}/lib/plugins/$self->{'name'}/files"; # copy all needed files now - my @files = qw( dhcpd.conf nat.conf nvram.5.0 runvmware-v2 ); + my @files = qw( vmware-init nvram.5.0 runvmware-v2 ); foreach my $file (@files) { - copyFile("$pluginFilesPath/$file", $pluginRepositoryPath); + copyFile("$pluginFilesPath/$file", $self->{'pluginRepositoryPath'}); } } @@ -164,7 +167,6 @@ sub removalPhase my $self = shift; my $pluginRepositoryPath = shift; my $pluginTempPath = shift; - my $openslxPath = shift; rmtree ( [ $pluginRepositoryPath ] ); diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index 47697c4d..e1d0d84b 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -40,7 +40,11 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then . /etc/sysconfig/config # prepare all needed vmware configuration files - testmkd /mnt/etc/vmware + if [ -d /mnt/etc/vmware ] ; then + rm -rf /mnt/etc/vmware/* + else + mkdir -p /mnt/etc/vmware + fi # write the /etc/vmware/slxvmconfig file # check for the several variables and write the several files: # dhcpd.conf for vmnet* interfaces @@ -90,7 +94,12 @@ device = /dev/vmnet8\nactiveFTP = 1\n[udp]\ntimeout = 60\n[incomingtcp]\n\ [incomingudp]" > /mnt/etc/vmware/nat.conf echo "00:50:56:F1:30:50" > /mnt/etc/vmware/vmnet-natd-8.mac fi - + # copy the runlevelscript to the proper place + cp /mnt/opt/openslx/plugin-repo/vmware/vmware-init \ + /mnt/etc/${D_INITDIR}/vmware + rllinker "vmware" 20 2 + + echo " * vmware part 1" ############################################################################# # vmware stuff first part: two scenarios @@ -105,8 +114,8 @@ device = /dev/vmnet8\nactiveFTP = 1\n[udp]\ntimeout = 60\n[incomingtcp]\n\ # get source of vmware image server (get type, server and path) if strinstr "/" "${vmware_imagesrc}" ; then vmimgprot=$(uri_token ${vmware_imagesrc} prot) - vmimgserv=$(uri_token ${vmware_imagesrc} server) - vmimgpath="$(uri_token ${vmware_imagesrc} path)" + vmimgserv=$(uri_token ${vmware_imagesrc} server) + vmimgpath="$(uri_token ${vmware_imagesrc} path)" fi if [ -n "${vmimgserv}" ] ; then testmkd /mnt/var/lib/vmware @@ -139,8 +148,7 @@ device = /dev/vmnet8\nactiveFTP = 1\n[udp]\ntimeout = 60\n[incomingtcp]\n\ # vmware stuff second part: setting up the environment # create needed directories and files - for i in /etc/vmware/vmnet1/dhcpd /etc/vmware/vmnet8/nat \ - /etc/vmware/vmnet8/dhcpd /var/run/vmware /etc/vmware/loopimg \ + for i in /var/run/vmware /etc/vmware/loopimg \ /etc/vmware/fd-loop /var/X11R6/bin /etc/X11/sessions; do testmkd /mnt/$i done @@ -183,30 +191,12 @@ device = /dev/vmnet8\nactiveFTP = 1\n[udp]\ntimeout = 60\n[incomingtcp]\n\ # needed for VMware 5.5.3 and versions below echo -e "\tmount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \ >>/mnt/etc/${D_INITDIR}/boot.slx - - # link /etc/init.d/vmware, so it starts uppon boot - if [ -f /mnt/etc/${D_INITDIR}/vmware ] ; then - rllinker "vmware" 20 2 - else - error "df_errvmw" nonfatal - fi chmod 1777 /mnt/var/run/vmware # define a variable where gdm/kdm should look for additional sessions # do we really need it? looks like we can delete it... # export vmsessions=/var/lib/vmware/vmsessions - # we configured vmware, so we can delete the not_configured file - rm /mnt/etc/vmware/not_configured 2>/dev/null - - # copy dhcpd.conf and nat for vmnet8 (nat) - # fixme: It should be possible to start just one vmware dhcp which should - # listen to both interfaces vmnet1 and vmnet8 ... - cp /mnt/opt/openslx/plugin-repo/vmware/dhcpd.conf \ - /mnt/etc/vmware/vmnet8/dhcpd 2>/dev/null - cp /mnt/opt/openslx/plugin-repo/vmware/nat.conf \ - /mnt/etc/vmware/vmnet8/nat 2>/dev/null - # TODO: perhaps we can a) kick out vmdir # b) configure vmdir by plugin configuration # TODO: How to start it. See Wiki. Currently a) implemnted diff --git a/os-plugins/plugins/vmware/files/vmware-startscript b/os-plugins/plugins/vmware/files/vmware-init index d41230ca..d41230ca 100755 --- a/os-plugins/plugins/vmware/files/vmware-startscript +++ b/os-plugins/plugins/vmware/files/vmware-init |