diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/iptables b/scripts/vm/hypervisor/xenserver/xenserver56/iptables deleted file mode 100644 index 41c3380d61a..00000000000 --- a/scripts/vm/hypervisor/xenserver/xenserver56/iptables +++ /dev/null @@ -1,24 +0,0 @@ -# Firewall configuration written by system-config-securitylevel -# Manual customization of this file is not recommended. -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] -:RH-Firewall-1-INPUT - [0:0] --A INPUT -j RH-Firewall-1-INPUT --A FORWARD -j RH-Firewall-1-INPUT --A RH-Firewall-1-INPUT -i lo -j ACCEPT --A RH-Firewall-1-INPUT -p icmp --icmp-type any -j ACCEPT --A RH-Firewall-1-INPUT -p 50 -j ACCEPT --A RH-Firewall-1-INPUT -p 51 -j ACCEPT --A RH-Firewall-1-INPUT -p udp --dport 5353 -d 224.0.0.251 -j ACCEPT --A RH-Firewall-1-INPUT -p udp -m udp --dport 631 -j ACCEPT --A RH-Firewall-1-INPUT -p tcp -m tcp --dport 631 -j ACCEPT --A RH-Firewall-1-INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A RH-Firewall-1-INPUT -m state --state NEW -m udp -p udp --dport 694 -j ACCEPT --A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 22 -j ACCEPT --A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 80 -j ACCEPT --A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 443 -j ACCEPT --A RH-Firewall-1-INPUT -p tcp -m tcp --dport 5900:6099 -j ACCEPT --A RH-Firewall-1-INPUT -j REJECT --reject-with icmp-host-prohibited -COMMIT diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch index 2ede998d5b8..429b539aab0 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver56/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch @@ -9,15 +9,12 @@ # If [source path] starts with '/', then it is absolute path. # If [source path] starts with '~', then it is path relative to management server home directory. # If [source path] does not start with '/' or '~', then it is relative path to the location of the patch file. -qemu-dm-wrapper=/opt/xensource/libexec scsiutil.py=/opt/xensource/sm cleanup.py=/opt/xensource/sm -vncterm-wrapper=/opt/xensource/libexec NFSSR.py=/opt/xensource/sm ISCSISR.py=/opt/xensource/sm LUNperVDI.py=/opt/xensource/sm nfs.py=/opt/xensource/sm -iptables=/etc/sysconfig patch.tgz=..,0775,/opt/xensource/bin vmops=..,0755,/etc/xapi.d/plugins systemvm.zip=../../../../../vms,0755,/opt/xensource/bin diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/qemu-dm-wrapper b/scripts/vm/hypervisor/xenserver/xenserver56/qemu-dm-wrapper deleted file mode 100755 index e4653e79446..00000000000 --- a/scripts/vm/hypervisor/xenserver/xenserver56/qemu-dm-wrapper +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) Citrix Systems 2007-2008. All rights reserved. -# -# Xen, the Xen logo, XenCenter, XenMotion are trademarks or registered -# trademarks of Citrix Systems, Inc., in the United States and other -# countries. - -import sys, os, time, resource - -DOMID=int(sys.argv[1]) -LOGFILE=sys.argv[2] - -SQUASH_VNC=False -SDL_ENABLED=True -SDL_ZOOM_ENABLED=True - -# enabling core dumps if /var/xen/qemu is not a ramdisk, disabling otherwise -try : - newlimits = None - oldlimits = resource.getrlimit(resource.RLIMIT_CORE) - f = open("/etc/mtab", "r") - for line in f: - if line.find("/var/xen/qemu") is not -1: - if line.find("tmpfs") is not -1 or line.find("ramfs") is not -1 : - newlimits = (0, oldlimits[1]) - break - if newlimits is None: - newlimits = (64 * 1024 * 1024, oldlimits[1]) - resource.setrlimit(resource.RLIMIT_CORE, newlimits) - f.close() -except: - pass - -# Check X is running -- disable SDL if it isn't: -h = os.popen("/bin/ps aux | /bin/fgrep 'X :0' | /bin/fgrep -v fgrep | /usr/bin/wc -l") -x_is_running = int(h.read()) -h.close() -if not x_is_running: - SDL_ENABLED=False - SDL_ZOOM_ENABLED=False - -log = open(LOGFILE, "wa") -log.write("qemu-dm-wrapper in python:\n") -log.write("Using domid: %d\n" % DOMID) -log.write("Core dumps size limit: %d\n" % newlimits[0]) -log.write("Arguments: %s\n" % " ".join(sys.argv[2:])) -os.system("xenstore-write /local/domain/%d/qemu-pid %d\n" % (DOMID, os.getpid())) -if SQUASH_VNC: - os.system("xenstore-write /local/domain/%d/console/vnc-port %d\n" % (DOMID, 6900+DOMID)) - -qemu_args = sys.argv[2:] -qemu_args.append("-monitor") -qemu_args.append("pty") - -if SDL_ENABLED: - qemu_args.append("-nograb") - qemu_args.append("-sdl") - -if SDL_ZOOM_ENABLED: - h = os.popen("/usr/bin/xenstore-read /local/host/display/vm-geometry", "r") - geom = h.read().strip() - h.close() - - if geom != "": - qemu_args.append("-geometry") - qemu_args.append(geom) - -# suppress the vnc args to qemu-dm -if SQUASH_VNC: - try: - vnc_idx = qemu_args.index("-vnc") - del qemu_args[vnc_idx: vnc_idx+2] - except ValueError, IndexError: - pass - - try: - vnc_idx = qemu_args.index("-vncunused") - del qemu_args[vnc_idx: vnc_idx+1] - except ValueError, IndexError: - pass -else: - qemu_args.append("-vnclisten") - qemu_args.append("0.0.0.0:1") - -def vm_uuid_from_dom_id(domid): - # domid --> uuid - h = os.popen("/opt/xensource/bin/list_domains | cut -f0-2 -d'|' | egrep '(^ *%d *\|)' | cut -f 2 -d'|'" % domid, "r") - uuid = h.read().strip() - h.close() - return uuid - -qemu_env = os.environ -if SDL_ENABLED: - # define qemu_env, add DISPLAY - qemu_env["DISPLAY"] = ":0.0" - # add the SDL env to set the qemu-dm window WM_CLASS, so that Ion can place the - # window in the correct workspace. - vm_uuid = vm_uuid_from_dom_id(DOMID) - qemu_env["SDL_VIDEO_X11_WMCLASS"] = "HVMXEN-" + vm_uuid - qemu_env["XAUTHORITY"] = "/root/.Xauthority" - qemu_env["HOME"] = "/root" - qemu_env["SDL_DISABLE_WAITMAPPED"] = "True" - -log.write("Arguments adjusted to: %s\n" % " ".join(qemu_args)) -log.write("everything else is from qemu-dm:\n") -log.flush() - -# redirect stdout to append to logfile -os.dup2(log.fileno(), 1) - -# redirect stderr to stdout (which now goes to the log) -os.dup2(1, 2) - -os.execve("/usr/lib/xen/bin/qemu-dm", qemu_args, qemu_env) diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/vncterm-wrapper b/scripts/vm/hypervisor/xenserver/xenserver56/vncterm-wrapper deleted file mode 100755 index a5d5d00bb19..00000000000 --- a/scripts/vm/hypervisor/xenserver/xenserver56/vncterm-wrapper +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Copyright (c) Citrix Systems 2007-2008. All rights reserved. -# -# Xen, the Xen logo, XenCenter, XenMotion are trademarks or registered -# trademarks of Citrix Systems, Inc., in the United States and other -# countries. - -DOMID=$1 -shift 1 - -#Getting the VM UUID -export VMUUID=`/opt/xensource/bin/list_domains -domid $DOMID -minimal` - -#For security reasons, we only listen on locahost by default -export VNCTERM_LISTEN="-v 0.0.0.0:1" - -VNCVIEWER="" -if test `/bin/ps aux | /bin/fgrep 'X :0' | /bin/fgrep -v fgrep | /usr/bin/wc -l` -eq 1 && test $DOMID -gt 0 -then - VNCVIEWER="--vncviewer=FullColor=0;LowColourLevel=2;AutoSelect=0;MenuKey=" -fi - -export DISPLAY=":0.0" -export HOME="/root" -export XAUTHORITY="/root/.Xauthority" - -# enabling core dumps if /var/xen/vncterm is not a ramdisk, disabling otherwise -if test "`grep -E "/var/xen/vncterm.*(tmpfs|ramfs)" /etc/mtab`" -then - ulimit -Sc 0 -else - ulimit -Sc 67108864 -fi - -echo vncterm-wrapper: -xenstore-write -s /local/domain/$DOMID/serial/0/vncterm-pid $$ -if [ -z "${XIU}" ]; then - exec /usr/lib/xen/bin/vncterm $VNCTERM_LISTEN $VNCVIEWER $* > /dev/null 2>&1 -else - exec xenstore-write -s /local/domain/$DOMID/serial/0/vnc-port 0 -fi