diff options
4 files changed, 13 insertions, 20 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index 0ac323c4..17d92fc0 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -41,20 +41,13 @@ sub initialize return 1; } -sub getRunlevelScriptPath -{ - my $self = shift; - - return '/etc/init.d/vmware'; -} - sub fillRunlevelScript { my $self = shift; my $location = shift; my $script = unshiftHereDoc(<<" End-of-Here"); - #!/bin/sh + #! /bin/sh # completely generic start/stop script, generated via stage1 'vmware' plugin # install # inspiration taken from vmware start script: diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/gentoo.pm index c223e98c..924c2fc2 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/gentoo.pm @@ -70,7 +70,7 @@ sub fillRunlevelScript if [ -n "\$vmnet1" ] ; then test -c /dev/vmnet1 || mknod c 119 1 /dev/vmnet1 # the path might be directly point to the plugin dir - $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \ + $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\ /dev/vmnet1 vmnet1 dhcpif="\$dhcpif vmnet1" ip addr add \$vmnet1 dev vmnet1 @@ -87,7 +87,7 @@ sub fillRunlevelScript if [ -n "\$vmnet8" ] ; then test -c /dev/vmnet1 || mknod c 119 8 /dev/vmnet8 # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50 - $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \ + $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\ -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf dhcpif="\$dhcpif vmnet8" ip addr add \$vmnet8 dev vmnet8 @@ -97,7 +97,7 @@ sub fillRunlevelScript if [ -n "\$dhcpif" ] ; then # the path might be directly point to the plugin dir mkdir /var/run/vmware 2>/dev/null - $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \ + $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \\ /var/run/vmware/dhcpd.leases -pf /var/run/vmnet-dhcpd-vmnet8.pid \$dhcpif fi } @@ -118,7 +118,7 @@ sub fillRunlevelScript stop() { # message output should match the given vendor-os ebegin "Stopping vmware background services ..." - killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \ + killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\ vmware-tray 2>/dev/null # wait for shutting down of interfaces usleep 50000 diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/suse.pm index 81e7aaf2..b3a39df5 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/suse.pm @@ -77,7 +77,7 @@ sub fillRunlevelScript if [ -n "\$vmnet1" ] ; then test -c /dev/vmnet1 || mknod c 119 1 /dev/vmnet1 # the path might be directly point to the plugin dir - $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \ + $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\ /dev/vmnet1 vmnet1 dhcpif="\$dhcpif vmnet1" ip addr add \$vmnet1 dev vmnet1 @@ -94,7 +94,7 @@ sub fillRunlevelScript if [ -n "\$vmnet8" ] ; then test -c /dev/vmnet1 || mknod c 119 8 /dev/vmnet8 # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50 - $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \ + $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\ -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf dhcpif="\$dhcpif vmnet8" ip addr add \$vmnet8 dev vmnet8 @@ -104,7 +104,7 @@ sub fillRunlevelScript if [ -n "\$dhcpif" ] ; then # the path might be directly point to the plugin dir mkdir /var/run/vmware 2>/dev/null - $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \ + $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \\ /var/run/vmware/dhcpd.leases -pf /var/run/vmnet-dhcpd-vmnet8.pid \$dhcpif fi } @@ -128,7 +128,7 @@ sub fillRunlevelScript stop) # message output should match the given vendor-os echo -n "Stopping vmware background services ..." - killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \ + killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\ vmware-tray 2>/dev/null # wait for shutting down of interfaces usleep 50000 diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/ubuntu.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/ubuntu.pm index de574891..7346918c 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/ubuntu.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/ubuntu.pm @@ -73,7 +73,7 @@ sub fillRunlevelScript if [ -n "\$vmnet1" ] ; then test -c /dev/vmnet1 || mknod c 119 1 /dev/vmnet1 # the path might be directly point to the plugin dir - $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \ + $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\ /dev/vmnet1 vmnet1 dhcpif="\$dhcpif vmnet1" ip addr add \$vmnet1 dev vmnet1 @@ -90,7 +90,7 @@ sub fillRunlevelScript if [ -n "\$vmnet8" ] ; then test -c /dev/vmnet1 || mknod c 119 8 /dev/vmnet8 # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50 - $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \ + $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\ -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf dhcpif="\$dhcpif vmnet8" ip addr add \$vmnet8 dev vmnet8 @@ -100,7 +100,7 @@ sub fillRunlevelScript if [ -n "\$dhcpif" ] ; then # the path might be directly point to the plugin dir mkdir /var/run/vmware 2>/dev/null - $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \ + $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \\ /var/run/vmware/dhcpd.leases -pf /var/run/vmnet-dhcpd-vmnet8.pid \$dhcpif fi } @@ -122,7 +122,7 @@ sub fillRunlevelScript stop) # message output should match the given vendor-os log_daemon_msg "Stopping vmware background services ..." "vmware" - killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \ + killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\ vmware-tray 2>/dev/null # wait for shutting down of interfaces usleep 50000 |