From f79069f512ba8f3ca51b158d6a0708df4b3b351d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 21 Nov 2013 14:52:05 +0100
Subject: [vmware] Fix broken vmware_env script relying on the wrong shell

---
 .../data/opt/openslx/scripts/systemd-vmware_env    | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'remote/modules/vmware/data/opt/openslx/scripts')

diff --git a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env
index 175f3bef..bf7bfc5e 100755
--- a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env
+++ b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/opt/openslx/bin/ash
 # Copyright (c) 2009 - OpenSLX GmbH 
 # 
 # This program is free software distributed under the GPL version 2. 
@@ -10,8 +10,6 @@
 # General information about OpenSLX can be found at http://openslx.org/ 
 # -----------------------------------------------------------------------------
 
-export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin
-
 VMWARE_CONF_DIR=/opt/openslx/etc/vmware
 
 for wait in 1 1 2 2 3 end; do
@@ -117,23 +115,23 @@ setup_network() {
 		  -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet8.leases," \
 	      ${VMWARE_CONF_DIR}/udhcpd.conf >/etc/vmware/udhcpd/udhcpd-vmnet8.conf
 	      # might be not needed any more ...
-	      echo -e "# Linux NAT configuration file" \
+	      echo "# Linux NAT configuration file" \
 		> /etc/vmware/nat.conf
-	      echo -e "[host]" \
+	      echo "[host]" \
 		>> /etc/vmware/nat.conf
-	      echo -e "ip = $vmnet/$vmpx" \
+	      echo "ip = $vmnet/$vmpx" \
 		>> /etc/vmware/nat.conf
-	      echo -e "device = /dev/vmnet8" \
+	      echo "device = /dev/vmnet8" \
 		>> /etc/vmware/nat.conf
-	      echo -e "activeFTP = 1" \
+	      echo "activeFTP = 1" \
 		>> /etc/vmware/nat.conf
-	      echo -e "[udp]" \
+	      echo "[udp]" \
 		>> /etc/vmware/nat.conf
-	      echo -e "timeout = 60" \
+	      echo "timeout = 60" \
 		>> /etc/vmware/nat.conf
-	      echo -e "[incomingtcp]" \
+	      echo "[incomingtcp]" \
 		>> /etc/vmware/nat.conf
-	      echo -e "[incomingudp]" \
+	      echo "[incomingudp]" \
 		>> /etc/vmware/nat.conf
 	      echo "00:50:56:F1:30:50" > /etc/vmware/vmnet-natd-8.mac
 	fi
-- 
cgit v1.2.3-55-g7522