diff options
Diffstat (limited to 'remote/modules/vmware/data')
| -rwxr-xr-x | remote/modules/vmware/data/opt/openslx/bin/vmplayer | 10 | ||||
| l---------[-rwxr-xr-x] | remote/modules/vmware/data/opt/openslx/bin/vmware | 12 | ||||
| -rwxr-xr-x | remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env | 77 | ||||
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/nvram (renamed from remote/modules/vmware/data/opt/openslx/etc/vmware/nvram) | bin | 8664 -> 8664 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include (renamed from remote/modules/vmware/data/opt/openslx/etc/vmware/run-virt.include) | 6 | ||||
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf (renamed from remote/modules/vmware/data/opt/openslx/etc/vmware/vmware.conf) | 0 |
6 files changed, 33 insertions, 72 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/bin/vmplayer b/remote/modules/vmware/data/opt/openslx/bin/vmplayer index 147f514f..0f7d9232 100755 --- a/remote/modules/vmware/data/opt/openslx/bin/vmplayer +++ b/remote/modules/vmware/data/opt/openslx/bin/vmplayer @@ -5,10 +5,12 @@ PREFIX=/usr/lib/vmware # depends on the vmware location # HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled export force_s3tc_enable=true -exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ - "$PREFIX"'/lib' \ - "$PREFIX"'/bin/vmplayer' \ - "$PREFIX"'/libconf' "$@" +PROG=$(basename $0) + +exec "$PREFIX/lib/wrapper-gtk24.sh" \ + "$PREFIX/lib" \ + "$PREFIX/bin/$PROG" \ + "$PREFIX/libconf" "$@" diff --git a/remote/modules/vmware/data/opt/openslx/bin/vmware b/remote/modules/vmware/data/opt/openslx/bin/vmware index 1fe9b11d..aa0b74b1 100755..120000 --- a/remote/modules/vmware/data/opt/openslx/bin/vmware +++ b/remote/modules/vmware/data/opt/openslx/bin/vmware @@ -1,11 +1 @@ -#!/bin/sh -# radically simplified version of the original script vmplayer by VMware Inc. -PREFIX=/usr/lib/vmware # depends on the vmware location -exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ - "$PREFIX"'/lib' \ - "$PREFIX"'/bin/vmware' \ - "$PREFIX"'/libconf' "$@" - - - - +vmplayer
\ No newline at end of file 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 bf7bfc5e..2112b2d7 100755 --- a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env +++ b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env @@ -10,18 +10,19 @@ # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- -VMWARE_CONF_DIR=/opt/openslx/etc/vmware +VMWARE_CONF_DIR=/opt/openslx/vmchooser/vmware +VMCHOOSER_CONF_DIR=/opt/openslx/vmchooser/config for wait in 1 1 2 2 3 end; do - grep '^SLX_DNS' /opt/openslx/config > /dev/null && break + grep '^SLX_DNS' "/opt/openslx/config" > /dev/null && break [ "$wait" == "end" ] && echo "No DNS config found, using google dns" && break echo "Waiting for DNS config.." sleep "$wait" done #source config file -. /opt/openslx/config -. ${VMWARE_CONF_DIR}/vmware.conf +. "/opt/openslx/config" +. "${VMWARE_CONF_DIR}/vmware.conf" vm_dhcpd() { @@ -32,7 +33,7 @@ vm_dhcpd() { [ -n "${wpad}" ] && wpad_config="option wpad ${wpad}" # configuring dhcpd stub for virtual networks -cat > ${VMWARE_CONF_DIR}/udhcpd.conf << EOF +cat > "${VMWARE_CONF_DIR}/udhcpd.conf" << EOF # general udhcpd configuration file for virtual machines written by $0 # start and end of the IP lease block @@ -77,34 +78,32 @@ EOF setup_network() { #from plugins/vmware/XX_vmware.sh - mkdir -p /tmp/virt/vmware -m 1777 - mkdir -p /dev/shm/vmware -m 1777 - mkdir -p /var/run/vmware -m 1777 - mkdir -p /etc/vmware/udhcpd + mkdir -p "/tmp/virt/vmware" -m 1777 + mkdir -p "/dev/shm/vmware" -m 1777 + mkdir -p "/var/run/vmware" -m 1777 + mkdir -p "/etc/vmware/udhcpd" # variable might contain ",NAT" which is to be taken off if [ -n "$vmnet1" ] ; then - local vmip=${vmnet1%/*} # x.x.x.x/yy => 'x.x.x.x'"> + local vmip="${vmnet1%/*}" # x.x.x.x/yy => 'x.x.x.x'"> local vmsub=$(echo $vmip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x # setting up the udhcpd configuration sed -e "s,NWIF,vmnet1,;s,/misc/,/vmware/," \ - -e "s,CNETWORK,$vmsub,;s,PIDFILE,/var/run/vmware/udhcpd-vmnet1.pid," \ - -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet1.leases," \ - ${VMWARE_CONF_DIR}/udhcpd.conf >/etc/vmware/udhcpd/udhcpd-vmnet1.conf + -e "s,CNETWORK,$vmsub,;s,PIDFILE,/var/run/vmware/udhcpd-vmnet1.pid," \ + -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet1.leases," \ + "${VMWARE_CONF_DIR}/udhcpd.conf" > "/etc/vmware/udhcpd/udhcpd-vmnet1.conf" # setting the base samba configuration if available - if [ -f /etc/openslx/vmchooser/smb.conf \ - -a -f /usr/sbin/smbd ] ; then - sed -e "s#NWIF#vmnet1,vmnet8#;s,PIDDIR,/var/run/vmware," \ - ${VMCHOOSER_CONF_DIR}/smb.conf \ - >/etc/vmware/smb.conf + if [ -f "$VMCHOOSER_CONF_DIR/smb.conf" -a -f "/usr/sbin/smbd" ] ; then + sed -e "s#NWIF#vmnet1,vmnet8#;s,PIDDIR,/var/run/vmware," \ + "${VMCHOOSER_CONF_DIR}/smb.conf" > "/etc/vmware/smb.conf" fi fi # vmware nat interface configuration if [ -n "$vmnet8" ] ; then - local vmnet8ip=${vmnet8%/*} - local vmpx=${vmnet8#*/} - local vmsub=$(echo $vmnet8ip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x"> + local vmnet8ip="${vmnet8%/*}" + local vmpx="${vmnet8#*/}" + local vmsub=$(echo "$vmnet8ip" | sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x"> # vmip is user for vmnet8 device # vmnet is user for config files nat.conf/dhcp local vmip="${vmsub}.1" @@ -139,47 +138,19 @@ setup_network() { ############################################################################ # vmware stuff second part: setting up the environment # make udhcpd more silent - touch /var/run/vmware/udhcpd-vmnet1.leases \ - /var/run/vmware/udhcpd-vmnet8.leases + touch "/var/run/vmware/udhcpd-vmnet1.leases" \ + "/var/run/vmware/udhcpd-vmnet8.leases" # create the needed devices which effects all vmware options # they are not created automatically via module load for i in "/dev/vmnet0 c 119 0" "/dev/vmnet1 c 119 1" \ "/dev/vmnet8 c 119 8" "/dev/vmmon c 10 165"; do - mknod $i + mknod "$i" done chmod 0700 /dev/vmnet* } -adapt_tmpfs() { - # from plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh - # Init hook to adapt the tmpfs size for VMware/Player - # (should be kept identical to the files of virtualbox plugin) - ############################################################################# - - # adapt tmpfs size (overbook) - case $(grep tmpfs /proc/mounts) in - */tmp*) - mount -o remount,size=175% /tmp - ;; - */uniontmp*) - mount -o remount,size=175% /uniontmp - ;; - esac -} - -#from /etc/init.d/vmware-env - -#functions: helper functions -tempdir () { - # Create a special tempfs directory - mkdir -m 1777 -p /tmp/vmware - # Don't mount special tempfs, when using local harddrive for /tmp - [ ! -n "$(cat /proc/mounts |grep ' /tmp '|grep '/dev/sd')" ] \ - && mount -t tmpfs -o size=180%,mode=1777 tmpfs /tmp/vmware -} - load_modules () { # VMplayer common stuff insmod /lib/modules/vmware/vmmon.ko @@ -242,11 +213,9 @@ case "$1" in #start: defines start function for initscript vm_dhcpd setup_network -# adapt_tmpfs # hack to access the first serial/parallel port chmod a+rw /dev/ttyS0 chmod a+rw /dev/parport0 - tempdir load_modules vmnetif vmblock diff --git a/remote/modules/vmware/data/opt/openslx/etc/vmware/nvram b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/nvram Binary files differindex 85125f1e..85125f1e 100644 --- a/remote/modules/vmware/data/opt/openslx/etc/vmware/nvram +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/nvram diff --git a/remote/modules/vmware/data/opt/openslx/etc/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include index e60d5a5b..2e7aeaf5 100755..100644 --- a/remote/modules/vmware/data/opt/openslx/etc/vmware/run-virt.include +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include @@ -329,7 +329,7 @@ $paraldev HEREEND # set the appropriate permissions for the vmware config file - chmod u+rwx ${conffile} >/dev/null 2>&1 + chmod u+rwx "${conffile}" >/dev/null 2>&1 } preferencesheader () @@ -431,7 +431,7 @@ diskfile="${vmpath}" vmhome="${HOME}/.vmware" # get several version infos for vmware/player -. /opt/openslx/etc/vmware/vmware.conf +. /opt/openslx/vmchooser/vmware/vmware.conf vmbuild=$buildversion vmversion=$version @@ -569,7 +569,7 @@ sync # own nvram. We need it for floppy drive b, default nvram has just drive a # TODO: optimize, currently kinda inefficient, too much copys, but we # don't know which one is installed... -cp "/opt/openslx/etc/vmware/nvram" "$confdir/nvram" 2>/dev/null +cp "/opt/openslx/vmchooser/vmware/nvram" "$confdir/nvram" 2>/dev/null # logging and stdout diff --git a/remote/modules/vmware/data/opt/openslx/etc/vmware/vmware.conf b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf index 210b814f..210b814f 100644 --- a/remote/modules/vmware/data/opt/openslx/etc/vmware/vmware.conf +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf |