From afe0559dfbe32d74145614cfd80c33f74b4d4d80 Mon Sep 17 00:00:00 2001 From: Volker Uhrig Date: Mon, 31 Mar 2008 19:09:25 +0000 Subject: * rename variable * added comments for later work git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1713 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 7 +++++-- os-plugins/plugins/vmware/XX_vmware.sh | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'os-plugins/plugins') diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 19e88615..a1f522ea 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -179,8 +179,8 @@ sub installationPhase # variants because we do not know which on is selected on client level # (code depends on distro/version and vmware location) # for local ... other vm-installations (TODO: generate list) - my @type = qw( local ); - foreach my $type (@type) { + my @types = qw( local ); + foreach my $type (@types) { # location of the vmware stuff, "local" for directly installed # package (more sophisticated assignment might be needed ...) if ( $type eq "local" ) { @@ -210,6 +210,8 @@ sub installationPhase # OLTA: this backup strategy is useless if invoked twice, so I have # deactivated it # rename ("/usr/bin/$file", "/usr/bin/$file.slx-bak"); + # TODO: check if it will really build a link. + # somehow i cant see one in stage1 linkFile("/var/X11R6/bin/$file", "/usr/bin/$file"); my $script = unshiftHereDoc(<<" End-of-Here"); #!/bin/sh @@ -221,6 +223,7 @@ sub installationPhase "\$PREFIX"'/bin/vmware' \ "\$PREFIX"'/libconf' "\$@" End-of-Here + # TODO: run chmod 755 after creation spitFile("$self->{'pluginRepositoryPath'}/$file", $script); } } diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index cd29cf2a..288b63ce 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -124,9 +124,9 @@ $(ipcalc -n $vmip/$vmpx|sed s/.*=//) {" \ >> /mnt/etc/vmware/nat.conf echo -e "activeFTP = 1" \ >> /mnt/etc/vmware/nat.conf - echo -e "[udp]" + echo -e "[udp]" \ >> /mnt/etc/vmware/nat.conf - echo -e "timeout = 60" + echo -e "timeout = 60" \ >> /mnt/etc/vmware/nat.conf echo -e "[incomingtcp]" \ >> /mnt/etc/vmware/nat.conf -- cgit v1.2.3-55-g7522