From 4fb7a17fb2bebcf75a6a7cc9837052f946e4d6a5 Mon Sep 17 00:00:00 2001 From: Volker Uhrig Date: Wed, 15 Oct 2008 11:15:00 +0000 Subject: * due of the plugin system, virtualization folder became deprecated git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2315 95ad53e4-c205-0410-b2fa-d234c58c8868 --- .../templates/Vorlage_VMwareImageAdministrator.xml | 43 -- virtualization/templates/client-config.xml.default | 8 - virtualization/templates/dhcpd.conf | 22 - virtualization/templates/nat.conf | 46 -- virtualization/templates/nvram.5.0 | Bin 8664 -> 0 bytes virtualization/templates/runvmware-v2 | 549 --------------------- virtualization/templates/xdialog.sh | 30 -- 7 files changed, 698 deletions(-) delete mode 100755 virtualization/templates/Vorlage_VMwareImageAdministrator.xml delete mode 100644 virtualization/templates/client-config.xml.default delete mode 100644 virtualization/templates/dhcpd.conf delete mode 100644 virtualization/templates/nat.conf delete mode 100644 virtualization/templates/nvram.5.0 delete mode 100644 virtualization/templates/runvmware-v2 delete mode 100644 virtualization/templates/xdialog.sh (limited to 'virtualization/templates') diff --git a/virtualization/templates/Vorlage_VMwareImageAdministrator.xml b/virtualization/templates/Vorlage_VMwareImageAdministrator.xml deleted file mode 100755 index e58d829b..00000000 --- a/virtualization/templates/Vorlage_VMwareImageAdministrator.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - # Imagename with proper suffix - - - # Information of the image creator - - - - - - - # Short description, shown in the menu - - - # Define long description shown when the Image is chosen - - - #os running in vmware, needed for vmware config file - - - # Network nat or bridged? - - - # values: vmware or virtualbox - - - #Description: Should the current image in use? if yes value is "true" - - - #Description: where should the current image be used? in the past slxgrp - - - #Description: as xdm menu? If yes "true", else "false" - - - #Description: priority, use a number to get it to a special position - # should only be used by our department and noone else - - - - diff --git a/virtualization/templates/client-config.xml.default b/virtualization/templates/client-config.xml.default deleted file mode 100644 index f1612fc9..00000000 --- a/virtualization/templates/client-config.xml.default +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/virtualization/templates/dhcpd.conf b/virtualization/templates/dhcpd.conf deleted file mode 100644 index 6bc581a4..00000000 --- a/virtualization/templates/dhcpd.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Configuration file for ISC 2.0b6pl1 vmnet-dhcpd operating on vmnet8. -# -# This file was automatically generated by the VMware configuration program. -# If you modify it, it will be backed up the next time you run the -# configuration program. -# -# We set domain-name-servers to make some DHCP clients happy -# (dhclient as configued in SuSE, TurboLinux, etc.). -# We also supply a domain name to make pump (Red Hat 6.x) happy. -# -allow unknown-clients; -default-lease-time 1800; # 30 minutes -max-lease-time 7200; # 2 hours - -subnet 192.168.100.0 netmask 255.255.255.0 { - range 192.168.100.100 192.168.100.101; - option broadcast-address 192.168.100.255; - option domain-name-servers 192.168.100.2; - option domain-name "localdomain"; - option routers 192.168.100.2; -} diff --git a/virtualization/templates/nat.conf b/virtualization/templates/nat.conf deleted file mode 100644 index 07d684f0..00000000 --- a/virtualization/templates/nat.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Linux NAT configuration file -[host] -# NAT gateway address -ip = 192.168.100.2 -netmask = 255.255.255.0 -# or ip = 172.16.184.2/24 - -# enable configuration; disabled by default for security reasons -#configport = 33445 - -# VMnet device if not specified on command line -device = /dev/vmnet8 - -# Allow PORT/EPRT FTP commands (they need incoming TCP stream...) -activeFTP = 1 - -# Allows the source to have any OUI. Turn this one if you change the OUI -# in the MAC address of your virtual machines. -#allowAnyOUI = 1 - -[udp] -# Timeout in seconds, 0 = no timeout, default = 60; real value might -# be up to 100% longer -timeout = 60 - -[incomingtcp] -# Use these with care - anyone can enter into your VM through these... - -# FTP (both active and passive FTP is always enabled) -# ftp localhost 8887 -#8887 = 172.16.184.128:21 - -# WEB (make sure that if you are using named webhosting, names point to -# your host, not to guest... And if you are forwarding port other -# than 80 make sure that your server copes with mismatched port -# number in Host: header) -# lynx http://localhost:8888 -#8888 = 172.16.184.128:80 - -# SSH -# ssh -p 8889 root@localhost -#8889 = 172.16.184.128:22 - -[incomingudp] -# UDP port forwarding example -#6000 = 172.16.184.128:6001 diff --git a/virtualization/templates/nvram.5.0 b/virtualization/templates/nvram.5.0 deleted file mode 100644 index 85125f1e..00000000 Binary files a/virtualization/templates/nvram.5.0 and /dev/null differ diff --git a/virtualization/templates/runvmware-v2 b/virtualization/templates/runvmware-v2 deleted file mode 100644 index 1705318b..00000000 --- a/virtualization/templates/runvmware-v2 +++ /dev/null @@ -1,549 +0,0 @@ -#!/bin/bash -# -# Description: Script for preparing VMware environment Diskless -# X Stations and interactive session chooser (v4) -# -# Author(s): see project authors file -# letzte Änderung Dirk, 15.10. -# Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg -# -# Version: 0.16.611 -# -################################################################################ - - -################################################################################ -## -## Put $HOME to another location -## -################################################################################ - -# We need to change $HOME so it saves everything to /tmp -#export HOME="/tmp/${USER}" -# following mkdir we have now twice in this script... but better twice -# as not seperated. Now its no problem to delete this -# "Put $HOME to another location" section later -#mkdir /tmp/${USER} -#ln -s /home/${USER}/.Xauthority /tmp/${USER}/.Xauthority - - - -### VARIABLES SECTION ########################################################## -## -## declaration of default variables -## -################################################################################ - -## "static" variables only changed within the script - -# The PATH... -export PATH="${PATH}:/var/X11R6/bin:/usr/X11R6/bin" - -# Last two values for MAC address -mac= - -# memory information. permem is value to calculate needed memory -mem= -totalmem= -permem=66 - -# virtual fd/cd/dvd and drive devices, floppy b: for configuration -#floppya is always false, if we have a floppy device or not isn't -#important. -floppya="FALSE" -floppyb="TRUE" -floppybname="/etc/vmware/loopimg/fd.img" -cdr_1="FALSE" -cdr_2="FALSE" -# ide is expected default, test for the virtual disk image type should -# be done while creating the runscripts ... -ide="TRUE" -scsi="FALSE" -hddrv="lsilogic" - -# Displayresolution needed for vmware.config -hostres=$(xvidtune -show 2>/dev/null| grep -ve "^$") -xres=$(echo "${hostres}" | awk '{print $3}') -yres=$(echo "${hostres}" | awk '{print $7}') - -# VMplayer buildversion -vmbuild= - -# VMware start options -#-X = fullscreen -vmopt="-X" - -# temporary disk space for logs, etc... -# use /tmp/vmware/${USER} if /tmp sits on NFS import -export tmpdir=/tmp/${USER} - -# configfile -confile="${tmpdir}/runvmware.conf" - -# users vmware config folder -vmhome="${HOME}/.vmware" -#vmhome="/tmp/${USER}/.vmware" - - -# unknow variables needed vor vmwplayer configuration -confver=8 -hver=4 - -# set hostname: using original hostname and adding string "-vm" -# variable isn't used anywhere in this script. but still works (however) -# TODO: Test it commented out -hostname="VM-${HOST}" - -# Folder of VirtualMachine Images -vmdir="/var/lib/vmware" - -# special Variables, persistence vmware? -#TODO: do we really need it? Should be everywhere nonpersistent -np="independent-nonpersistent" - -######## -## TODO: everything clean till here -######## - -# File if its a link. Stupid crap -#TODO: perhaps we don't need it -rightsfile= -#TODO: don't know what it is for. check later -noimage=0 -# image checking variable -filecheck= - - -## Image depending variables. This values will be changed by the script - -# vmware image file -imagename="CHANGEIT" -diskfile="${vmdir}/${imagename}" - -#TODO: check for a faster way, perhaps we should put this into XML -# oh - yeah!! Why not do it on the SERVER??? It has enough power and has -# to do it once and not during every start on a client :) -#grepping every file could take much (network) resources. And if its -#an IDE Image, but has somewhere the string ddb.adapterType stuff can -#become screwed -# NOOOOOOO - We do not check on every start on every client!!! -# check if IDE or SCSI -#hddrv=$(grep -m 1 -ia "ddb.adapterType" ${diskfile} | awk -F "\"" '{print $2}') -#if [ "${hddrv}" = "ide" ]; then -# ide="TRUE" -# scsi="FALSE" -#elif [ "${hddrv}" = "lsilogic" ]; then -# ide="FALSE" -# scsi="TRUE" -#elif [ "${hddrv}" = "buslogic" ]; then -# ide="FALSE" -# scsi="TRUE" -#fi - -# define name for VMware window -displayname="CHANGEIT" - -# Definition of the client system -vmostype="CHANGEIT" - -# Definition of the client system -network="CHANGEIT" - - -# command line variables -# start with this this default commmand line options + extra -# TODO: defaults laut datei --include /var/lib/vmware/tmpl/winconfig -# --include include code right before program start - -# Should we debug? Hell yes, we should always debug! -debug=0 - -#TODO: Bad done... we should do this another way later -last_changes=$(head -n 15 $0 | grep "@" | awk -F ", " '{print $2}' \ - | awk -F "-" '{print $3" "$2" "$1}' | sort -bfnr \ - | awk '{print $3"-"$2"-"$1}' | grep -m 1 [0-9]) -version=$(head -n 15 $0 | grep "# Version: " | awk '{print $3}') - -############# -## TODO: End of uncleaned area -############# - - - - - - -### FUNCTION SECTION ########################################################### -## -## In this script used functions -## -################################################################################ - -### write runvmware.conf ####################################################### -#TODO: only not yet checked function -filecheck () -{ - filecheck=$(LANG=us ls -lh ${diskfile} 2>&1) - writelog "Filecheck:\n${filecheck}\n" - #TODO: don't understand the sence in it - noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l) - rightsfile=${diskfile} - - # check if link - # TODO: mistake with 2nd rightsfile if its in another directory? - if [ -L "${diskfile}" ]; then - # take link target - rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F "-> *" '{print $2}') - rightsfile=${vmdir}/${rightsfile} - filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1) - fi - - # does file exist - if [ "${noimage}" -ge "1" ]; then - writelog "Vmware Image Problem:\c" - writelog "\tThe image you've specified doesn't exist." - writelog "Filecheck says:\c" - writelog "\t\t${diskfile}:\n\t\t\tNo such file or directory" - writelog "Hint:\c" - writelog "\t\t\tCompare spelling of the image with your options.\n" - exit 1 - fi - - # readable? - if ! [ -r "${diskfile}" >/dev/null 2>&1 \ - -o -r "${diskfile}" >/dev/null 2>&1 ]; then - writelog "Vmware Image Problem:\c" - writelog "\tThe image you've specified has wrong rights." - writelog "Filecheck says:\t\t$(echo ${filecheck} \ - | awk '{print $1" "$3" "$4}') ${rightsfile}" - writelog "Hint:\t\t\tChange rights with: chmod a+r ${rightsfile}\n" - exit 1 - fi - - # writable (for persistent-mode)? - if ! [ -w "${diskfile}" >/dev/null 2>&1 \ - -o -w "${diskfile}" >/dev/null 2>&1 ] \ - && [ "${np}" = "independent-persistent" ]; then - writelog "Vmware Image Problem:\c" - writelog "\tThe image you've specified has wrong rights." - writelog "Filecheck says:\t\t$(echo ${filecheck} \ - | awk '{print $1" "$3" "$4}') ${rightsfile}" - writelog "Hint:\t\t\tUse nonpersistent-mode or change rights to rw\n" - exit 1 - fi -} - - -### write runvmware.conf ####################################################### -runvmwareconfheader () -{ - echo " - ############################################################################## - ###### This configuration file was generated by 'runvmware', ###### - ###### dont use it for your own configurations - it will be overwritten ###### - ###### ###### - - ###### identity ############################################################## - displayName = \"${displayname}\" - guestOS = \"${vmostype}\" - config.version = \"${confver}\" - virtualHW.version = \"${hver}\" - - memsize = \"${mem}\" - numvcpus = \"1\" - - ###### ide-disks ############################################################# - ide0:0.mode = \"${np}\" - ide0:0.present = \"${ide}\" - ide0:0.fileName = \"${diskfile}\" - - ide1:0.present = \"${cdr_1}\" - ide1:0.autodetect = \"TRUE\" - ide1:0.fileName = \"auto detect\" - ide1:0.deviceType = \"cdrom-raw\" - - ide1:1.present = \"${cdr_2}\" - ide1:1.autodetect = \"TRUE\" - ide1:1.fileName = \"auto detect\" - ide1:1.deviceType = \"cdrom-raw\" - - ###### scsi-disks ############################################################ - scsi0.present = \"${scsi}\" - scsi0.virtualDev = \"lsilogic\" - scsi0:0.mode = \"${np}\" - scsi0:0.present = \"${scsi}\" - scsi0:0.fileName = \"${diskfile}\" - - ###### nics ################################################################## - ethernet0.present = \"TRUE\" - ethernet0.addressType = \"static\" - ethernet0.connectionType = \"${network}\" - ethernet0.address = \"00:50:56:0D:${mac}\" - - ###### sound ################################################################# - sound.present = \"TRUE\" - sound.virtualDev = \"es1371\" - - ###### usb ################################################################### - usb.present = \"TRUE\" - usb.generic.autoconnect = \"TRUE\" - - ###### floppies ############################################################## - floppy0.present = \"${floppya}\" - floppy0.fileName = \"auto detect\" - - # we need floppy b: this for our windows client configuration - floppy1.present = \"${floppyb}\" - floppy1.fileType = \"file\" - floppy1.fileName = \"${floppybname}\" - floppy1.startConnected = \"TRUE\" - - ###### ports ################################################################# - parallel0.present = \"FALSE\" - - serial0.present = \"FALSE\" - - ###### shared folders ######################################################## - sharedFolder0.present = \"TRUE\" - sharedFolder0.enabled = \"TRUE\" - sharedFolder0.expiration = \"never\" - sharedFolder0.guestName = \"Home\" - sharedFolder0.hostPath = \"${HOME}\" - sharedFolder0.readAccess = \"TRUE\" - sharedFolder0.writeAccess = \"TRUE\" - sharedFolder.maxNum = \"1\" - - ###### misc ################################################################## - tmpDirectory = \"${tmpdir}\" - mainMem.useNamedFile = \"TRUE\" - snapshot.disabled = \"TRUE\" - tools.syncTime = \"TRUE\" - # use redoLogDir = \"/dev/shm\" if sitting on NFS import - redoLogDir = \"${tmpdir}\" - hints.hideAll = \"TRUE\" - logging = \"FALSE\" - isolation.tools.hgfs.disable = \"FALSE\" - isolation.tools.dnd.disable = \"TRUE\" - isolation.tools.copy.enable = \"TRUE\" - isolation.tools.paste.enabled = \"TRUE\" - gui.restricted = \"TRUE\" - pref.hotkey.shift = \"TRUE\" - pref.hotkey.control = \"TRUE\" - pref.hotkey.alt = \"TRUE\" - svga.maxWidth = \"${xres}\" - svga.maxHeight = \"${yres}\" - " \ - >${confile} - - # set the appropriate permissions for the vmware config file - chmod u+rwx ${confile} >/dev/null 2>&1 -} - - -### creates user configurationfile in ${vmhome} ################################ -preferencesheader () -{ - echo " - ############################################################################## - ###### This configuration file was generated by 'runvmware', ###### - ###### dont use it for your own configurations - it will be overwritten ###### - ###### ###### - ################################## Wichtig! ################################## - ###### *.vmem wird immer angelegt und frisst soviel Speicher, wie fuer ###### - ###### den Gast vorgesehen. Sollte nicht im tempfs liegen. NFS OK, da ###### - ###### IO nur einmal beim Start erheblich. Wird gesteuert ueber ###### - ###### tmpDirectory = /nfs-viel-platz und darin wird dann vmware-\$user ###### - ###### angelegt. ###### - - hints.hideAll = \"true\" - pref.exchangeSelections = \"true\" - pref.hotkey.shift = \"true\" - pref.tip.startup = \"false\" - pref.vmplayer.exit.vmAction = \"poweroff\" - pref.vmplayer.fullscreen.autohide = \"true\" - pref.vmplayer.webUpdateOnStartup = \"false\" - prefvmx.defaultVMPath = \"${vmhome}\" - prefvmx.mru.config = \"${confile}:\" - tmpDirectory = \"${tmpdir}\" - webUpdate.checkPeriod = \"manual\" - pref.eula.size = \"2\" - pref.eula.0.appName = \"VMware Player\" - pref.eula.0.buildNumber = \"${vmbuild}\" - pref.eula.1.appName = \"VMware Workstation\" - pref.eula.1.buildNumber = \"${vmbuild}\" - " \ - >${vmhome}/preferences -} - - -### log function ############################################################### -# function to write to stdout and logfile -writelog () -{ - # write to stdout - echo -e "$1" - - # log in file - echo -e "$1" >>${tmpdir}/runvmware.${USER}.log -} - - - - - - -### MAIN SECTION ############################################################### -## -## Main part of the script... -## -################################################################################ - -# Delete the LOCK file. its unsecure, but ... -rm -f ${tmpdir}/*LOCK >/dev/null 2>&1 - -# create vmware directories -mkdir -p ${tmpdir} >/dev/null 2>&1 -mkdir -p ${vmhome} >/dev/null 2>&1 - -# NO X-server, no runvmware ;) -[ -z "$DISPLAY" ] && echo -e "\n\tStart only within a desktop!\n" && exit 1 - -# logo for console -cat < /etc/vmware/fd-loop/config.xml -echo "" > /etc/vmware/fd-loop/config.xml -echo " " >> /etc/vmware/fd-loop/config.xml -echo " " >> /etc/vmware/fd-loop/config.xml -echo " " >> /etc/vmware/fd-loop/config.xml -echo " " >> /etc/vmware/fd-loop/config.xml -echo " " >> /etc/vmware/fd-loop/config.xml -# if we have a scanner, then copy scannerinformation to this xml -sanelines="$(wc -l /etc/sane.d/net.conf|awk '{ print $1 };')" -if [ -f /etc/sane.d/net.conf ] && [ "${sanelines}" -eq 1 ]; then - echo "" \ - >> /etc/vmware/fd-loop/config.xml - echo "" >> /etc/vmware/fd-loop/config.xml -fi -echo " " >> /etc/vmware/fd-loop/config.xml -echo "" >> /etc/vmware/fd-loop/config.xml - - -# sync is needed to ensure that data is really written to virtual disk -sync - -# own nvram. We need it for floppy drive b, default nvram has just drive a -cp /var/lib/vmware/templates/nvram.5.0 ${tmpdir}/nvram - -# adjust volume -writelog "Unmuting sound...\c" -amixer -q sset Master 28 unmute -amixer -q sset PCM 28 unmute -writelog "finished\n" - -### run vmplayer ############################################################### -# ...with the automatically written config file -if [ $(which vmplayer 2>/dev/null) ]; then writelog "\nStarting VMplayer..." - # run VMplayer - writelog "... vmplayer ${vmopt} ${confile}...\n" - vmplayer ${vmopt} ${confile} 2>&1 >/dev/null -else - writelog "\nNo VMware/VMPlayer found!\n" - exit 1 -fi - -writelog "\nBye.\n" -exit 0 diff --git a/virtualization/templates/xdialog.sh b/virtualization/templates/xdialog.sh deleted file mode 100644 index dd1c5862..00000000 --- a/virtualization/templates/xdialog.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script will run Xdialog. menulist-create will add all menu entrys -# from the different .xdialog files -# -#TODO: change path_to_this_script to path of this file. needed, because -# a return will exit Xdialog - - -themesdir="/var/lib/openslx/themes" -res=$(xvidtune -show | grep -wo "\".*\"" | sed "s/\"//g") -if ! [ -f ${themesdir}/bootsplash/images/silent-${res}.jpg ]; then - img=$(ls ${themesdir}/bootsplash/images/ | grep -m 1 "silent") - display -window root ${themesdir}/bootsplash/images/${img} -else - display -window root ${themesdir}/bootsplash/images/silent-${res}.jpg -fi - - -$($(which Xdialog) --rc-file /var/lib/openslx/themes/Xdialog/gtkrc \ - --title "Desktop / VMware-ImageMenu" \ - --screen-center \ - --fill --no-wrap \ - --stdout \ - --no-tags \ - --ok-label "START" \ - --item-help \ - --menubox "Please choose the image you would like to run:" \ - 35 80 0 \ - "/var/X11R6/bin/xdialog.sh" "No Image - Don't press return too fast" "" \ -- cgit v1.2.3-55-g7522