This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit aff48ad46f549c2065e1760d5cc96a733e1faeaf Author: Rohit Yadav <[email protected]> AuthorDate: Wed Nov 29 18:01:36 2017 +0530 remove old dead code/files Signed-off-by: Rohit Yadav <[email protected]> --- pom.xml | 1 - systemvm/bindir/cloud-setup-console-proxy.in | 220 ------------ systemvm/conf.dom0/agent.properties.in | 46 --- systemvm/conf.dom0/consoleproxy.properties.in | 23 -- systemvm/conf.dom0/log4j-cloud.xml.in | 111 ------ systemvm/conf/agent.properties.ssvm | 21 -- .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 ----- .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 ----- .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 ----- .../SYSCONFDIR/init.d/cloud-console-proxy.in | 110 ------ systemvm/libexec/console-proxy-runner.in | 90 ----- systemvm/patches/debian/README | 34 -- systemvm/patches/debian/config.dat | 398 --------------------- systemvm/patches/debian/convert.sh | 64 ---- systemvm/patches/debian/qemuconvert.sh | 32 -- systemvm/patches/debian/systemvm.vmx | 37 -- systemvm/patches/debian/systemvm.xml | 53 --- systemvm/patches/debian/vhdconvert.sh | 40 --- systemvm/patches/debian/xe/xe-daemon | 65 ---- systemvm/patches/debian/xe/xe-linux-distribution | 267 -------------- systemvm/patches/debian/xe/xe-update-guest-attrs | 226 ------------ systemvm/pom.xml | 11 - systemvm/vm-script/vmops | 119 ------ 23 files changed, 2256 deletions(-) diff --git a/pom.xml b/pom.xml index caa26cd..08aa81e 100644 --- a/pom.xml +++ b/pom.xml @@ -929,7 +929,6 @@ <exclude>systemvm/conf/environment.properties</exclude> <exclude>systemvm/js/jquery.js</exclude> <exclude>systemvm/js/jquery.flot.navigate.js</exclude> - <exclude>systemvm/patches/debian/systemvm.vmx</exclude> <exclude>systemvm/patches/debian/config/root/.ssh/authorized_keys</exclude> <exclude>systemvm/patches/debian/config/etc/apache2/httpd.conf</exclude> <exclude>systemvm/patches/debian/config/etc/apache2/vhost.template</exclude> diff --git a/systemvm/bindir/cloud-setup-console-proxy.in b/systemvm/bindir/cloud-setup-console-proxy.in deleted file mode 100755 index 6439c0f..0000000 --- a/systemvm/bindir/cloud-setup-console-proxy.in +++ /dev/null @@ -1,220 +0,0 @@ -#!/usr/bin/env python - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -import sys, os, subprocess, errno, re, getopt - -# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ---- -# ---- We do this so cloud_utils can be looked up in the following order: -# ---- 1) Sources directory -# ---- 2) waf configured PYTHONDIR -# ---- 3) System Python path -for pythonpath in ( - "@PYTHONDIR@", - os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"), - ): - if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath) -# ---- End snippet of code ---- -import cloud_utils -from cloud_utils import stderr - -E_GENERIC= 1 -E_NOKVM = 2 -E_NODEFROUTE = 3 -E_DHCP = 4 -E_NOPERSISTENTNET = 5 -E_NETRECONFIGFAILED = 6 -E_VIRTRECONFIGFAILED = 7 -E_FWRECONFIGFAILED = 8 -E_CPRECONFIGFAILED = 9 -E_CPFAILEDTOSTART = 10 -E_NOFQDN = 11 - -def bail(errno=E_GENERIC,message=None,*args): - if message: stderr(message,*args) - stderr("Cloud Console Proxy setup aborted") - sys.exit(errno) - - -#---------------- boilerplate for python 2.4 support - - -# CENTOS does not have this -- we have to put this here -try: - from subprocess import check_call - from subprocess import CalledProcessError -except ImportError: - def check_call(*popenargs, **kwargs): - import subprocess - retcode = subprocess.call(*popenargs, **kwargs) - cmd = kwargs.get("args") - if cmd is None: cmd = popenargs[0] - if retcode: raise CalledProcessError(retcode, cmd) - return retcode - - class CalledProcessError(Exception): - def __init__(self, returncode, cmd): - self.returncode = returncode ; self.cmd = cmd - def __str__(self): return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) - -# ------------ end boilerplate ------------------------- - -def check_hostname(): return check_call(["hostname",'--fqdn']) - -class Command: - def __init__(self,name,parent=None): - self.__name = name - self.__parent = parent - def __getattr__(self,name): - if name == "_print": name = "print" - return Command(name,self) - def __call__(self,*args): - cmd = self.__get_recursive_name() + list(args) - #print " ",cmd - popen = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE) - m = popen.communicate() - ret = popen.wait() - if ret: - e = CalledProcessError(ret,cmd) - e.stdout,e.stderr = m - raise e - class CommandOutput: - def __init__(self,stdout,stderr): - self.stdout = stdout - self.stderr = stderr - return CommandOutput(*m) - def __lt__(self,other): - cmd = self.__get_recursive_name() - #print " ",cmd,"<",other - popen = subprocess.Popen(cmd,stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) - m = popen.communicate(other) - ret = popen.wait() - if ret: - e = CalledProcessError(ret,cmd) - e.stdout,e.stderr = m - raise e - class CommandOutput: - def __init__(self,stdout,stderr): - self.stdout = stdout - self.stderr = stderr - return CommandOutput(*m) - - def __get_recursive_name(self,sep=None): - m = self - l = [] - while m is not None: - l.append(m.__name) - m = m.__parent - l.reverse() - if sep: return sep.join(l) - else: return l - def __str__(self): - return '<Command %r>'%self.__get_recursive_name(sep=" ") - - def __repr__(self): return self.__str__() - -ip = Command("ip") -service = Command("service") -chkconfig = Command("chkconfig") -ufw = Command("ufw") -iptables = Command("iptables") -augtool = Command("augtool") -ifconfig = Command("ifconfig") -uuidgen = Command("uuidgen") - -Fedora = os.path.exists("/etc/fedora-release") -CentOS = os.path.exists("/etc/centos-release") or ( os.path.exists("/etc/redhat-release") and not os.path.exists("/etc/fedora-release") ) - -#--------------- procedure starts here ------------ - -def main(): - # parse cmd line - opts, args = getopt.getopt(sys.argv[1:], "a", ["host=", "zone=", "pod="]) - host=None - zone=None - pod=None - autoMode=False - do_check_kvm = True - for opt, arg in opts: - if opt == "--host": - if arg != "": - host = arg - elif opt == "--zone": - if arg != "": - zone = arg - elif opt == "--pod": - if arg != "": - pod = arg - elif opt == "-a": - autoMode=True - servicename = "@PACKAGE@-console-proxy" - - if autoMode: - cloud_utils.setLogFile("/var/log/cloud/setupConsoleProxy.log") - - stderr("Welcome to the Cloud Console Proxy setup") - stderr("") - - try: - check_hostname() - stderr("The hostname of this machine is properly set up") - except CalledProcessError,e: - bail(E_NOFQDN,"This machine does not have an FQDN (fully-qualified domain name) for a hostname") - - stderr("Stopping the Cloud Console Proxy") - cloud_utils.stop_service(servicename) - stderr("Cloud Console Proxy stopped") - - ports = "8002".split() - if Fedora or CentOS: - try: - o = chkconfig("--list","iptables") - if ":on" in o.stdout and os.path.exists("/etc/sysconfig/iptables"): - stderr("Setting up firewall rules to permit traffic to Cloud services") - service.iptables.start() ; print o.stdout + o.stderr - for p in ports: iptables("-I","INPUT","1","-p","tcp","--dport",p,'-j','ACCEPT') - o = service.iptables.save() ; print o.stdout + o.stderr - except CalledProcessError,e: - print e.stdout+e.stderr - bail(E_FWRECONFIGFAILED,"Firewall rules could not be set") - else: - stderr("Setting up firewall rules to permit traffic to Cloud services") - try: - for p in ports: ufw.allow(p) - stderr("Rules set") - except CalledProcessError,e: - print e.stdout+e.stderr - bail(E_FWRECONFIGFAILED,"Firewall rules could not be set") - - stderr("We are going to enable ufw now. This may disrupt network connectivity and service availability. See the ufw documentation for information on how to manage ufw firewall policies.") - try: - o = ufw.enable < "y\n" ; print o.stdout + o.stderr - except CalledProcessError,e: - print e.stdout+e.stderr - bail(E_FWRECONFIGFAILED,"Firewall could not be enabled") - - cloud_utils.setup_consoleproxy_config("@CPSYSCONFDIR@/agent.properties", host, zone, pod) - stderr("Enabling and starting the Cloud Console Proxy") - cloud_utils.enable_service(servicename) - stderr("Cloud Console Proxy restarted") - -if __name__ == "__main__": - main() - -# FIXMES: 1) nullify networkmanager on ubuntu (asking the user first) and enable the networking service permanently diff --git a/systemvm/conf.dom0/agent.properties.in b/systemvm/conf.dom0/agent.properties.in deleted file mode 100644 index 1920481..0000000 --- a/systemvm/conf.dom0/agent.properties.in +++ /dev/null @@ -1,46 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# Sample configuration file for VMOPS console proxy - -instance=ConsoleProxy -consoleproxy.httpListenPort=8002 - -#resource= the java class, which agent load to execute -resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource - -#host= The IP address of management server -host=localhost - -#port = The port management server listening on, default is 8250 -port=8250 - -#pod= The pod, which agent belonged to -pod=default - -#zone= The zone, which agent belonged to -zone=default - -#private.network.device= the private nic device -# if this is commented, it is autodetected on service startup -# private.network.device=cloudbr0 - -#public.network.device= the public nic device -# if this is commented, it is autodetected on service startup -# public.network.device=cloudbr0 - -#guid= a GUID to identify the agent diff --git a/systemvm/conf.dom0/consoleproxy.properties.in b/systemvm/conf.dom0/consoleproxy.properties.in deleted file mode 100644 index a3cddbc..0000000 --- a/systemvm/conf.dom0/consoleproxy.properties.in +++ /dev/null @@ -1,23 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -consoleproxy.tcpListenPort=0 -consoleproxy.httpListenPort=80 -consoleproxy.httpCmdListenPort=8001 -consoleproxy.jarDir=./applet/ -consoleproxy.viewerLinger=180 -consoleproxy.reconnectMaxRetry=5 diff --git a/systemvm/conf.dom0/log4j-cloud.xml.in b/systemvm/conf.dom0/log4j-cloud.xml.in deleted file mode 100644 index 0d78a95..0000000 --- a/systemvm/conf.dom0/log4j-cloud.xml.in +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> - - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender"> - <param name="Append" value="true"/> - <param name="Threshold" value="WARN"/> - <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy"> - <param name="FileNamePattern" value="@CPLOG@.%d{yyyy-MM-dd}.gz"/> - <param name="ActiveFileName" value="@CPLOG@"/> - </rollingPolicy> - <layout class="org.apache.log4j.EnhancedPatternLayout"> - <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/> - </layout> - </appender> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - <param name="Threshold" value="WARN"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/> - </layout> - </appender> - - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> - - <category name="com.cloud.console.ConsoleCanvas"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyViwer"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy"> - <priority value="INFO"/> - </category> - - <category name="com.cloud"> - <priority value="DEBUG"/> - </category> - - <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> - <category name="org.apache"> - <priority value="INFO"/> - </category> - - <category name="org"> - <priority value="INFO"/> - </category> - - <category name="net"> - <priority value="INFO"/> - </category> - - <!-- Limit the com.amazonaws category to INFO as its DEBUG is verbose --> - <category name="com.amazonaws"> - <priority value="INFO"/> - </category> - - <!-- Limit the httpclient.wire category to INFO as its DEBUG is verbose --> - <category name="httpclient.wire"> - <priority value="INFO"/> - </category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <level value="INFO"/> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> diff --git a/systemvm/conf/agent.properties.ssvm b/systemvm/conf/agent.properties.ssvm deleted file mode 100644 index 2f87b88..0000000 --- a/systemvm/conf/agent.properties.ssvm +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -#mount.path=~/secondary-storage/ -resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource -testCifsMount=cifs://192.168.1.1/CSHV3?user=administrator&password=1pass%40word1 -#testLocalRoot=test diff --git a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in deleted file mode 100644 index 3ec4d06..0000000 --- a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# chkconfig: 35 99 10 -# description: Cloud Console Proxy - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well - -. /etc/rc.d/init.d/functions - -# set environment variables - -SHORTNAME=`basename $0` -PIDFILE=@PIDDIR@/"$SHORTNAME".pid -LOCKFILE=@LOCKDIR@/"$SHORTNAME" -LOGFILE=@CPLOG@ -PROGNAME="Cloud Console Proxy" - -unset OPTIONS -[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME" -DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize -PROG=@LIBEXECDIR@/console-proxy-runner - -start() { - echo -n $"Starting $PROGNAME: " - if hostname --fqdn >/dev/null 2>&1 ; then - daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \ - -n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS - RETVAL=$? - echo - else - failure - echo - echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr - RETVAL=9 - fi - [ $RETVAL = 0 ] && touch ${LOCKFILE} - return $RETVAL -} - -stop() { - echo -n $"Stopping $PROGNAME: " - killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p ${PIDFILE} $SHORTNAME - RETVAL=$? - ;; - restart) - stop - sleep 3 - start - ;; - condrestart) - if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then - stop - sleep 3 - start - fi - ;; - *) - echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}" - RETVAL=3 -esac - -exit $RETVAL - diff --git a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in deleted file mode 100644 index 3ec4d06..0000000 --- a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# chkconfig: 35 99 10 -# description: Cloud Console Proxy - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well - -. /etc/rc.d/init.d/functions - -# set environment variables - -SHORTNAME=`basename $0` -PIDFILE=@PIDDIR@/"$SHORTNAME".pid -LOCKFILE=@LOCKDIR@/"$SHORTNAME" -LOGFILE=@CPLOG@ -PROGNAME="Cloud Console Proxy" - -unset OPTIONS -[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME" -DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize -PROG=@LIBEXECDIR@/console-proxy-runner - -start() { - echo -n $"Starting $PROGNAME: " - if hostname --fqdn >/dev/null 2>&1 ; then - daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \ - -n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS - RETVAL=$? - echo - else - failure - echo - echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr - RETVAL=9 - fi - [ $RETVAL = 0 ] && touch ${LOCKFILE} - return $RETVAL -} - -stop() { - echo -n $"Stopping $PROGNAME: " - killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p ${PIDFILE} $SHORTNAME - RETVAL=$? - ;; - restart) - stop - sleep 3 - start - ;; - condrestart) - if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then - stop - sleep 3 - start - fi - ;; - *) - echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}" - RETVAL=3 -esac - -exit $RETVAL - diff --git a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in deleted file mode 100644 index 3ec4d06..0000000 --- a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# chkconfig: 35 99 10 -# description: Cloud Console Proxy - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well - -. /etc/rc.d/init.d/functions - -# set environment variables - -SHORTNAME=`basename $0` -PIDFILE=@PIDDIR@/"$SHORTNAME".pid -LOCKFILE=@LOCKDIR@/"$SHORTNAME" -LOGFILE=@CPLOG@ -PROGNAME="Cloud Console Proxy" - -unset OPTIONS -[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME" -DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize -PROG=@LIBEXECDIR@/console-proxy-runner - -start() { - echo -n $"Starting $PROGNAME: " - if hostname --fqdn >/dev/null 2>&1 ; then - daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \ - -n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS - RETVAL=$? - echo - else - failure - echo - echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr - RETVAL=9 - fi - [ $RETVAL = 0 ] && touch ${LOCKFILE} - return $RETVAL -} - -stop() { - echo -n $"Stopping $PROGNAME: " - killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p ${PIDFILE} $SHORTNAME - RETVAL=$? - ;; - restart) - stop - sleep 3 - start - ;; - condrestart) - if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then - stop - sleep 3 - start - fi - ;; - *) - echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}" - RETVAL=3 -esac - -exit $RETVAL - diff --git a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in deleted file mode 100755 index 0c7be73..0000000 --- a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# chkconfig: 35 99 10 -# description: Cloud Console Proxy - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well - -. /lib/lsb/init-functions -. /etc/default/rcS - -# set environment variables - -SHORTNAME=`basename $0` -PIDFILE=@PIDDIR@/"$SHORTNAME".pid -LOCKFILE=@LOCKDIR@/"$SHORTNAME" -LOGFILE=@CPLOG@ -PROGNAME="Cloud Console Proxy" - -unset OPTIONS -[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME" -DAEMONIZE=@BINDIR@/@PACKAGE@-daemonize -PROG=@LIBEXECDIR@/console-proxy-runner - -start() { - log_daemon_msg $"Starting $PROGNAME" "$SHORTNAME" - if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if hostname --fqdn >/dev/null 2>&1 ; then - true - else - log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME" - log_end_msg 1 - exit 1 - fi - - if start-stop-daemon --start --quiet \ - --pidfile "$PIDFILE" \ - --exec "$DAEMONIZE" -- -n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS - RETVAL=$? - then - rc=0 - sleep 1 - if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then - log_failure_msg "$PROG failed to start" - rc=1 - fi - else - rc=1 - fi - - if [ $rc -eq 0 ]; then - log_end_msg 0 - else - log_end_msg 1 - rm -f "$PIDFILE" - fi -} - -stop() { - echo -n $"Stopping $PROGNAME" "$SHORTNAME" - start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE" - log_end_msg $? - rm -f "$PIDFILE" -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME" - RETVAL=$? - ;; - restart) - stop - sleep 3 - start - ;; - *) - echo $"Usage: $SHORTNAME {start|stop|restart|status|help}" - RETVAL=3 -esac - -exit $RETVAL - diff --git a/systemvm/libexec/console-proxy-runner.in b/systemvm/libexec/console-proxy-runner.in deleted file mode 100755 index 4f18aab..0000000 --- a/systemvm/libexec/console-proxy-runner.in +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -#run.sh runs the agent client. - -cd `dirname "$0"` - -SYSTEMJARS="@SYSTEMJARS@" -SCP=$(build-classpath $SYSTEMJARS) ; if [ $? != 0 ] ; then SCP="@SYSTEMCLASSPATH@" ; fi -DCP="@DEPSCLASSPATH@" -ACP="@AGENTCLASSPATH@" -export CLASSPATH=$SCP:$DCP:$ACP:@CPSYSCONFDIR@ -for jarfile in "@PREMIUMJAVADIR@"/* ; do - if [ ! -e "$jarfile" ] ; then continue ; fi - CLASSPATH=$jarfile:$CLASSPATH -done -for plugin in "@PLUGINJAVADIR@"/* ; do - if [ ! -e "$plugin" ] ; then continue ; fi - CLASSPATH=$plugin:$CLASSPATH -done -export CLASSPATH - -set -e -cd "@CPLIBDIR@" -echo Current directory is "$PWD" -echo CLASSPATH to run the console proxy: "$CLASSPATH" - -export PATH=/sbin:/usr/sbin:"$PATH" -SERVICEARGS= -for x in private public ; do - configuration=`grep -q "^$x.network.device" "@CPSYSCONFDIR@"/agent.properties || true` - if [ -n "$CONFIGURATION" ] ; then - echo "Using manually-configured network device $CONFIGURATION" - else - defaultroute=`ip route | grep ^default | cut -d ' ' -f 5` - test -n "$defaultroute" - echo "Using auto-discovered network device $defaultroute which is the default route" - SERVICEARGS="$SERVICEARGS $x.network.device="$defaultroute - fi -done - -function termagent() { - if [ "$agentpid" != "" ] ; then - echo Killing VMOps Console Proxy "(PID $agentpid)" with SIGTERM >&2 - kill -TERM $agentpid - echo Waiting for agent to exit >&2 - wait $agentpid - ex=$? - echo Agent exited with return code $ex >&2 - else - echo Agent PID is unknown >&2 - fi -} - -trap termagent TERM -while true ; do - java -Xms128M -Xmx384M -cp "$CLASSPATH" "$@" com.cloud.agent.AgentShell $SERVICEARGS & - agentpid=$! - echo "Console Proxy started. PID: $!" >&2 - wait $agentpid - ex=$? - if [ $ex -gt 128 ]; then - echo "wait on console proxy process interrupted by SIGTERM" >&2 - exit $ex - fi - echo "Console proxy exited with return code $ex" >&2 - if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then - echo "Exiting..." > /dev/stderr - exit $ex - fi - echo "Restarting console proxy..." > /dev/stderr - sleep 1 -done diff --git a/systemvm/patches/debian/README b/systemvm/patches/debian/README deleted file mode 100644 index 5d79c35..0000000 --- a/systemvm/patches/debian/README +++ /dev/null @@ -1,34 +0,0 @@ -#################################################### - Note there is a new systemvm build script based on - Veewee(Vagrant) under tools/appliance. -#################################################### - -1. The buildsystemvm.sh script builds a 32-bit system vm disk based on the Debian Squeeze distro. This system vm can boot on any hypervisor thanks to the pvops support in the kernel. It is fully automated -2. The files under config/ are the specific tweaks to the default Debian configuration that are required for CloudStack operation. -3. The variables at the top of the buildsystemvm.sh script can be customized: - IMAGENAME=systemvm # dont touch this - LOCATION=/var/lib/images/systemvm # - MOUNTPOINT=/mnt/$IMAGENAME/ # this is where the image is mounted on your host while the vm image is built - IMAGELOC=$LOCATION/$IMAGENAME.img - PASSWORD=password # password for the vm - APT_PROXY= #you can put in an APT cacher such as apt-cacher-ng - HOSTNAME=systemvm # dont touch this - SIZE=2000 # dont touch this for now - DEBIAN_MIRROR=ftp.us.debian.org/debian - MINIMIZE=true # if this is true, a lot of docs, fonts, locales and apt cache is wiped out - -4. The systemvm includes the (non-free) Sun JRE. You can put in the standard debian jre-headless package instead but it pulls in X and bloats the image. -5. You need to be 'root' to run the buildsystemvm.sh script -6. The image is a raw image. You can run the convert.sh tool to produce images suitable for Citrix Xenserver, VMWare and KVM. - * Conversion to Citrix Xenserver VHD format requires the vhd-util tool. You can use the - -- checked in config/bin/vhd-util) OR - -- build the vhd-util tool yourself as follows: - a. The xen repository has a tool called vhd-util that compiles and runs on any linux system (http://xenbits.xensource.com/xen-4.0-testing.hg?file/8e8dd38374e9/tools/blktap2/vhd/ or full Xen source at http://www.xen.org/products/xen_source.html). - b. Apply this patch: http://lists.xensource.com/archives/cgi-bin/mesg.cgi?a=xen-devel&i=006101cb22f6%242004dd40%24600e97c0%24%40zhuo%40cloudex.cn. - c. Build the vhd-util tool - cd tools/blktap2 - make - sudo make install - * Conversion to ova (VMWare) requires the ovf tool, available from - http://communities.vmware.com/community/vmtn/server/vsphere/automationtools/ovf - * Conversion to QCOW2 requires qemu-img diff --git a/systemvm/patches/debian/config.dat b/systemvm/patches/debian/config.dat deleted file mode 100644 index b16638f..0000000 --- a/systemvm/patches/debian/config.dat +++ /dev/null @@ -1,398 +0,0 @@ -Name: adduser/homedir-permission -Template: adduser/homedir-permission -Value: true -Owners: adduser - -Name: ca-certificates/enable_crts -Template: ca-certificates/enable_crts -Value: brasil.gov.br/brasil.gov.br.crt, cacert.org/cacert.org.crt, cacert.org/class3.crt, cacert.org/root.crt, debconf.org/ca.crt, gouv.fr/cert_igca_dsa.crt, gouv.fr/cert_igca_rsa.crt, mozilla/ABAecom_=sub.__Am._Bankers_Assn.=_Root_CA.crt, mozilla/AddTrust_External_Root.crt, mozilla/AddTrust_Low-Value_Services_Root.crt, mozilla/AddTrust_Public_Services_Root.crt, mozilla/AddTrust_Qualified_Certificates_Root.crt, mozilla/America_Online_Root_Certification_Authority_1.crt, mozilla/America_On [...] -Owners: ca-certificates -Variables: - enable_crts = brasil.gov.br/brasil.gov.br.crt, cacert.org/cacert.org.crt, cacert.org/class3.crt, cacert.org/root.crt, debconf.org/ca.crt, gouv.fr/cert_igca_dsa.crt, gouv.fr/cert_igca_rsa.crt, mozilla/ABAecom_=sub.__Am._Bankers_Assn.=_Root_CA.crt, mozilla/AddTrust_External_Root.crt, mozilla/AddTrust_Low-Value_Services_Root.crt, mozilla/AddTrust_Public_Services_Root.crt, mozilla/AddTrust_Qualified_Certificates_Root.crt, mozilla/America_Online_Root_Certification_Authority_1.crt, mozilla/Am [...] - -Name: ca-certificates/new_crts -Template: ca-certificates/new_crts -Owners: ca-certificates -Variables: - new_crts = - -Name: ca-certificates/trust_new_crts -Template: ca-certificates/trust_new_crts -Value: yes -Owners: ca-certificates - -Name: debconf-apt-progress/info -Template: debconf-apt-progress/info -Owners: debconf - -Name: debconf-apt-progress/media-change -Template: debconf-apt-progress/media-change -Owners: debconf - -Name: debconf-apt-progress/preparing -Template: debconf-apt-progress/preparing -Owners: debconf - -Name: debconf-apt-progress/title -Template: debconf-apt-progress/title -Owners: debconf - -Name: debconf/frontend -Template: debconf/frontend -Value: noninteractive -Owners: debconf - -Name: debconf/priority -Template: debconf/priority -Value: high -Owners: debconf - -Name: dhcp3-client/dhclient-needs-restarting -Template: dhcp3-client/dhclient-needs-restarting -Owners: dhcp3-client - -Name: dhcp3-client/dhclient-script_moved -Template: dhcp3-client/dhclient-script_moved -Owners: dhcp3-client - -Name: glibc/restart-failed -Template: glibc/restart-failed -Owners: libc6 - -Name: glibc/restart-services -Template: glibc/restart-services -Owners: libc6 - -Name: glibc/upgrade -Template: glibc/upgrade -Owners: libc6 - -Name: libpam-modules/disable-screensaver -Template: libpam-modules/disable-screensaver -Owners: libpam-modules - -Name: libpam0g/restart-failed -Template: libpam0g/restart-failed -Owners: libpam0g - -Name: libpam0g/restart-services -Template: libpam0g/restart-services -Owners: libpam0g - -Name: libpam0g/xdm-needs-restart -Template: libpam0g/xdm-needs-restart -Owners: libpam0g - -Name: libssl0.9.8/restart-failed -Template: libssl0.9.8/restart-failed -Owners: libssl0.9.8 - -Name: libssl0.9.8/restart-services -Template: libssl0.9.8/restart-services -Owners: libssl0.9.8 - -Name: linux-base/disk-id-convert-auto -Template: linux-base/disk-id-convert-auto -Owners: linux-base - -Name: linux-base/disk-id-convert-plan -Template: linux-base/disk-id-convert-plan -Owners: linux-base - -Name: linux-base/disk-id-convert-plan-no-relabel -Template: linux-base/disk-id-convert-plan-no-relabel -Owners: linux-base - -Name: linux-base/disk-id-manual -Template: linux-base/disk-id-manual -Owners: linux-base - -Name: linux-base/disk-id-manual-boot-loader -Template: linux-base/disk-id-manual-boot-loader -Owners: linux-base - -Name: linux-image-2.6.32-bpo.5-686/postinst/bootloader-error-2.6.32-bpo.5-686 -Template: linux-image-2.6.32-bpo.5-686/postinst/bootloader-error-2.6.32-bpo.5-686 -Owners: linux-image-2.6.32-bpo.5-686 - -Name: linux-image-2.6.32-bpo.5-686/postinst/bootloader-test-error-2.6.32-bpo.5-686 -Template: linux-image-2.6.32-bpo.5-686/postinst/bootloader-test-error-2.6.32-bpo.5-686 -Owners: linux-image-2.6.32-bpo.5-686 - -Name: linux-image-2.6.32-bpo.5-686/postinst/depmod-error-initrd-2.6.32-bpo.5-686 -Template: linux-image-2.6.32-bpo.5-686/postinst/depmod-error-initrd-2.6.32-bpo.5-686 -Owners: linux-image-2.6.32-bpo.5-686 - -Name: linux-image-2.6.32-bpo.5-686/postinst/missing-firmware-2.6.32-bpo.5-686 -Template: linux-image-2.6.32-bpo.5-686/postinst/missing-firmware-2.6.32-bpo.5-686 -Owners: linux-image-2.6.32-bpo.5-686 - -Name: linux-image-2.6.32-bpo.5-686/prerm/removing-running-kernel-2.6.32-bpo.5-686 -Template: linux-image-2.6.32-bpo.5-686/prerm/removing-running-kernel-2.6.32-bpo.5-686 -Owners: linux-image-2.6.32-bpo.5-686 - -Name: linux-image-2.6.32-bpo.5-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-686 -Template: linux-image-2.6.32-bpo.5-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-686 -Owners: linux-image-2.6.32-bpo.5-686 - -Name: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-error-2.6.32-bpo.5-xen-686 -Template: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-error-2.6.32-bpo.5-xen-686 -Owners: linux-image-2.6.32-bpo.5-xen-686 - -Name: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-test-error-2.6.32-bpo.5-xen-686 -Template: linux-image-2.6.32-bpo.5-xen-686/postinst/bootloader-test-error-2.6.32-bpo.5-xen-686 -Owners: linux-image-2.6.32-bpo.5-xen-686 - -Name: linux-image-2.6.32-bpo.5-xen-686/postinst/depmod-error-initrd-2.6.32-bpo.5-xen-686 -Template: linux-image-2.6.32-bpo.5-xen-686/postinst/depmod-error-initrd-2.6.32-bpo.5-xen-686 -Owners: linux-image-2.6.32-bpo.5-xen-686 - -Name: linux-image-2.6.32-bpo.5-xen-686/postinst/missing-firmware-2.6.32-bpo.5-xen-686 -Template: linux-image-2.6.32-bpo.5-xen-686/postinst/missing-firmware-2.6.32-bpo.5-xen-686 -Owners: linux-image-2.6.32-bpo.5-xen-686 - -Name: linux-image-2.6.32-bpo.5-xen-686/prerm/removing-running-kernel-2.6.32-bpo.5-xen-686 -Template: linux-image-2.6.32-bpo.5-xen-686/prerm/removing-running-kernel-2.6.32-bpo.5-xen-686 -Owners: linux-image-2.6.32-bpo.5-xen-686 - -Name: linux-image-2.6.32-bpo.5-xen-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-xen-686 -Template: linux-image-2.6.32-bpo.5-xen-686/prerm/would-invalidate-boot-loader-2.6.32-bpo.5-xen-686 -Owners: linux-image-2.6.32-bpo.5-xen-686 - -Name: locales/default_environment_locale -Template: locales/default_environment_locale -Value: en_US.UTF-8 -Owners: locales -Variables: - locales = en_US.UTF-8 - -Name: locales/locales_to_be_generated -Template: locales/locales_to_be_generated -Value: en_US.UTF-8 UTF-8 -Owners: locales -Variables: - locales = aa_DJ ISO-8859-1, aa_DJ.UTF-8 UTF-8, aa_ER UTF-8, aa_ER@saaho UTF-8, aa_ET UTF-8, af_ZA ISO-8859-1, af_ZA.UTF-8 UTF-8, am_ET UTF-8, an_ES ISO-8859-15, an_ES.UTF-8 UTF-8, ar_AE ISO-8859-6, ar_AE.UTF-8 UTF-8, ar_BH ISO-8859-6, ar_BH.UTF-8 UTF-8, ar_DZ ISO-8859-6, ar_DZ.UTF-8 UTF-8, ar_EG ISO-8859-6, ar_EG.UTF-8 UTF-8, ar_IN UTF-8, ar_IQ ISO-8859-6, ar_IQ.UTF-8 UTF-8, ar_JO ISO-8859-6, ar_JO.UTF-8 UTF-8, ar_KW ISO-8859-6, ar_KW.UTF-8 UTF-8, ar_LB ISO-8859-6, ar_LB.UTF-8 UTF-8, ar [...] - -Name: openswan/create_rsa_key -Template: openswan/create_rsa_key -Value: true -Owners: openswan -Flags: seen - -Name: openswan/enable-oe -Template: openswan/enable-oe -Value: false -Owners: openswan -Flags: seen - -Name: openswan/existing_x509_certificate -Template: openswan/existing_x509_certificate -Value: false -Owners: openswan -Flags: seen - -Name: openswan/existing_x509_certificate_filename -Template: openswan/existing_x509_certificate_filename -Owners: openswan - -Name: openswan/existing_x509_key_filename -Template: openswan/existing_x509_key_filename -Owners: openswan - -Name: openswan/restart -Template: openswan/restart -Value: true -Owners: openswan - -Name: openswan/rsa_key_length -Template: openswan/rsa_key_length -Value: 2048 -Owners: openswan - -Name: openswan/rsa_key_type -Template: openswan/rsa_key_type -Value: x509 -Owners: openswan -Flags: seen - -Name: openswan/start_level -Template: openswan/start_level -Value: earliest -Owners: openswan - -Name: openswan/x509_common_name -Template: openswan/x509_common_name -Value: -Owners: openswan - -Name: openswan/x509_country_code -Template: openswan/x509_country_code -Value: AT -Owners: openswan - -Name: openswan/x509_email_address -Template: openswan/x509_email_address -Value: -Owners: openswan - -Name: openswan/x509_locality_name -Template: openswan/x509_locality_name -Value: -Owners: openswan - -Name: openswan/x509_organization_name -Template: openswan/x509_organization_name -Value: -Owners: openswan - -Name: openswan/x509_organizational_unit -Template: openswan/x509_organizational_unit -Value: -Owners: openswan - -Name: openswan/x509_self_signed -Template: openswan/x509_self_signed -Value: true -Owners: openswan -Flags: seen - -Name: openswan/x509_state_name -Template: openswan/x509_state_name -Value: -Owners: openswan - -Name: portmap/loopback -Template: portmap/loopback -Value: false -Owners: portmap - -Name: shared/accepted-sun-dlj-v1-1 -Template: shared/accepted-sun-dlj-v1-1 -Value: true -Owners: sun-java6-bin, sun-java6-jre -Flags: seen - -Name: shared/error-sun-dlj-v1-1 -Template: shared/error-sun-dlj-v1-1 -Owners: sun-java6-bin, sun-java6-jre - -Name: shared/kernel-image/really-run-bootloader -Template: shared/kernel-image/really-run-bootloader -Owners: linux-image-2.6.32-bpo.5-686, linux-image-2.6.32-bpo.5-xen-686 - -Name: shared/present-sun-dlj-v1-1 -Template: shared/present-sun-dlj-v1-1 -Value: true -Owners: sun-java6-bin, sun-java6-jre -Flags: seen - -Name: ssh/disable_cr_auth -Template: ssh/disable_cr_auth -Owners: openssh-server - -Name: ssh/encrypted_host_key_but_no_keygen -Template: ssh/encrypted_host_key_but_no_keygen -Owners: openssh-server - -Name: ssh/new_config -Template: ssh/new_config -Owners: openssh-server - -Name: ssh/use_old_init_script -Template: ssh/use_old_init_script -Value: true -Owners: openssh-server -Flags: seen - -Name: ssh/vulnerable_host_keys -Template: ssh/vulnerable_host_keys -Owners: openssh-server - -Name: sun-java6-jre/jcepolicy -Template: sun-java6-jre/jcepolicy -Owners: sun-java6-jre - -Name: sun-java6-jre/stopthread -Template: sun-java6-jre/stopthread -Owners: sun-java6-jre - -Name: tzdata/Areas -Template: tzdata/Areas -Value: Etc -Owners: tzdata -Flags: seen - -Name: tzdata/Zones/Africa -Template: tzdata/Zones/Africa -Owners: tzdata - -Name: tzdata/Zones/America -Template: tzdata/Zones/America -Owners: tzdata - -Name: tzdata/Zones/Antarctica -Template: tzdata/Zones/Antarctica -Owners: tzdata - -Name: tzdata/Zones/Arctic -Template: tzdata/Zones/Arctic -Owners: tzdata - -Name: tzdata/Zones/Asia -Template: tzdata/Zones/Asia -Owners: tzdata - -Name: tzdata/Zones/Atlantic -Template: tzdata/Zones/Atlantic -Owners: tzdata - -Name: tzdata/Zones/Australia -Template: tzdata/Zones/Australia -Owners: tzdata - -Name: tzdata/Zones/Etc -Template: tzdata/Zones/Etc -Value: UTC -Owners: tzdata -Flags: seen - -Name: tzdata/Zones/Europe -Template: tzdata/Zones/Europe -Owners: tzdata - -Name: tzdata/Zones/Indian -Template: tzdata/Zones/Indian -Owners: tzdata - -Name: tzdata/Zones/Pacific -Template: tzdata/Zones/Pacific -Owners: tzdata - -Name: tzdata/Zones/SystemV -Template: tzdata/Zones/SystemV -Owners: tzdata - -Name: ucf/changeprompt -Template: ucf/changeprompt -Owners: ucf - -Name: ucf/changeprompt_threeway -Template: ucf/changeprompt_threeway -Owners: ucf - -Name: ucf/show_diff -Template: ucf/show_diff -Owners: ucf - -Name: ucf/title -Template: ucf/title -Owners: ucf - -Name: udev/new_kernel_needed -Template: udev/new_kernel_needed -Owners: udev - -Name: udev/reboot_needed -Template: udev/reboot_needed -Owners: udev - diff --git a/systemvm/patches/debian/convert.sh b/systemvm/patches/debian/convert.sh deleted file mode 100755 index 27098a1..0000000 --- a/systemvm/patches/debian/convert.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - - - - - -begin=$(date +%s) -echo "Backing up systemvm.img" -cp systemvm.img systemvm.img.tmp -echo "Converting raw image to fixed vhd" -vhd-util convert -s 0 -t 1 -i systemvm.img.tmp -o systemvm.vhd &> /dev/null -echo "Converting fixed vhd to dynamic vhd" -vhd-util convert -s 1 -t 2 -i systemvm.vhd -o systemvm.vhd &> /dev/null -echo "Compressing vhd..." -bzip2 -c systemvm.vhd > systemvm.vhd.bz2 -echo "Done VHD" - -echo "Converting raw image to qcow2" -qemu-img convert -f raw -O qcow2 systemvm.img systemvm.qcow2 -echo "Compressing qcow2..." -bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2 -echo "Done qcow2" -echo "Converting raw image to vmdk" -qemu-img convert -f raw -O vmdk systemvm.img systemvm.vmdk -echo "Done creating vmdk" -echo "Creating ova appliance " -ovftool systemvm.vmx systemvm.ova -echo "Done creating OVA" -echo "Cleaning up..." -rm -vf systemvm.vmdk -rm -vf systemvm.vhd.bak - -echo "Compressing raw image..." -bzip2 -c systemvm.img > systemvm.img.bz2 -echo "Done compressing raw image" - -echo "Generating md5sums" -md5sum systemvm.img > md5sum -md5sum systemvm.img.bz2 >> md5sum -md5sum systemvm.vhd >> md5sum -md5sum systemvm.vhd.bz2 >> md5sum -md5sum systemvm.qcow2 >> md5sum -md5sum systemvm.qcow2.bz2 >> md5sum -md5sum systemvm.ova >> md5sum -fin=$(date +%s) -t=$((fin-begin)) -echo "Finished compressing/converting image in $t seconds" diff --git a/systemvm/patches/debian/qemuconvert.sh b/systemvm/patches/debian/qemuconvert.sh deleted file mode 100755 index dc8eb15..0000000 --- a/systemvm/patches/debian/qemuconvert.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - - - - -echo "Converting raw image to qcow2" -qemu-img convert -f raw -O qcow2 systemvm.img systemvm.qcow2 -echo "Compressing qcow2..." -bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2 -echo "Done qcow2" -echo "Converting raw image to vmdk" -qemu-img convert -f raw -O vmdk systemvm.img systemvm.vmdk -echo "Compressing vmdk..." -bzip2 -c systemvm.vmdk > systemvm.vmdk.bz2 -echo "Done vmdk" diff --git a/systemvm/patches/debian/systemvm.vmx b/systemvm/patches/debian/systemvm.vmx deleted file mode 100644 index 9b93449..0000000 --- a/systemvm/patches/debian/systemvm.vmx +++ /dev/null @@ -1,37 +0,0 @@ -config.version = "8" -displayname = "systemvm" -ethernet0.addressType = "generated" -ethernet0.connectionType = "bridged" -ethernet0.present = "true" -ethernet0.startConnected = "true" -ethernet0.virtualDev = "e1000" -floppy0.autodetect = "false" -floppy0.fileType = "device" -floppy0.present = "true" -floppy0.startConnected = "false" -guestos = "debian5" -ide0:0.deviceType = "disk" -ide0:0.fileName = "systemvm.vmdk" -ide0:0.present = "true" -ide1:0.autodetect = "true" -ide1:0.deviceType = "atapi-cdrom" -ide1:0.present = "true" -ide1:0.startConnected = "false" -memsize = "256" -numvcpus = "1" -pciBridge0.present = "TRUE" -pciBridge4.functions = "8" -pciBridge4.present = "TRUE" -pciBridge4.virtualDev = "pcieRootPort" -pciBridge5.functions = "8" -pciBridge5.present = "TRUE" -pciBridge5.virtualDev = "pcieRootPort" -pciBridge6.functions = "8" -pciBridge6.present = "TRUE" -pciBridge6.virtualDev = "pcieRootPort" -pciBridge7.functions = "8" -pciBridge7.present = "TRUE" -pciBridge7.virtualDev = "pcieRootPort" -svga.autodetect = "true" -virtualhw.version = "7" -vmci0.present = "TRUE" diff --git a/systemvm/patches/debian/systemvm.xml b/systemvm/patches/debian/systemvm.xml deleted file mode 100644 index fffc077..0000000 --- a/systemvm/patches/debian/systemvm.xml +++ /dev/null @@ -1,53 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<domain type='kvm' id='4'> - <name>systemvm2</name> - <memory>1572864</memory> - <currentMemory>1572864</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='i686' >hvm</type> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <!--<emulator>/usr/bin/qemu-system-x86_64</emulator>--> - <emulator>/usr/bin/qemu-kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw' cache='writeback'/> - <source file='/var/lib/images/systemvm2/systemvm.img'/> - <!-- <target dev='hda' bus='ide'/> --> - <target dev='vda' bus='virtio'/> - </disk> - <interface type='network'> - <mac address='52:54:00:65:a8:eb'/> - <source network='default'/> - <target dev='vnet0'/> - <model type='virtio' /> - </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='5900' autoport='yes'/> - </devices> -</domain> - diff --git a/systemvm/patches/debian/vhdconvert.sh b/systemvm/patches/debian/vhdconvert.sh deleted file mode 100755 index 0b0dbfb..0000000 --- a/systemvm/patches/debian/vhdconvert.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - - - - -# BUILDING vhd-util on Linux -# The xen repository has a tool called vhd-util that compiles and runs on any linux system -# (http://xenbits.xensource.com/xen-4.0-testing.hg?file/8e8dd38374e9/tools/blktap2/vhd/ or full Xen source at http://www.xen.org/products/xen_source.html). -# Apply this patch: http://lists.xensource.com/archives/cgi-bin/mesg.cgi?a=xen-devel&i=006101cb22f6%242004dd40%24600e97c0%24%40zhuo%40cloudex.cn. -# Build the vhd-util tool: -# cd tools/blktap2 -# make -# sudo make install - -echo "Backing up systemvm.img" -cp systemvm.img systemvm.img.tmp -echo "Converting raw image to fixed vhd" -vhd-util convert -s 0 -t 1 -i systemvm.img.tmp -o systemvm.vhd -echo "Converting fixed vhd to dynamic vhd" -vhd-util convert -s 1 -t 2 -i systemvm.vhd -o systemvm.vhd -echo "Compressing..." -bzip2 -c systemvm.vhd > systemvm.vhd.bz2 -echo "Done" diff --git a/systemvm/patches/debian/xe/xe-daemon b/systemvm/patches/debian/xe/xe-daemon deleted file mode 100644 index bc514d7..0000000 --- a/systemvm/patches/debian/xe/xe-daemon +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -LANG="C" -export LANG - -usage() { - echo "$0 [ -p <pidfile> ]" >&2 - exit 1 -} - -# Parse command line opts -while [ $# -ne 0 ] ; do - arg="$1" - shift - case "$arg" in - "-p") - [ $# -eq 0 ] && usage - pidfile="$1" - shift - mkdir -p "$(dirname "$pidfile")" - echo $$ > "$pidfile" - ;; - *) - usage - ;; - esac -done - -XE_UPDATE_GUEST_ATTRS=${XE_UPDATE_GUEST_ATTRS:-/usr/sbin/xe-update-guest-attrs} -XE_DAEMON_RATE=${XE_DAEMON_RATE:-60} # run once a minute by default -XE_MEMORY_UPDATE_DIVISOR=${XE_MEMORY_UPDATE_DIVISOR:-2} # update mem stats 1/2 as often by dflt - -# Delete xenstore cache following each reboot -rm -rf /var/cache/xenstore - -MEMORY_UPDATE_COUNTER=0 -while true ; do - if [ ${MEMORY_UPDATE_COUNTER} -eq 0 ] ; then - MEMORY=--memory - MEMORY_UPDATE_COUNTER=${XE_MEMORY_UPDATE_DIVISOR} - else - MEMORY= - fi - MEMORY_UPDATE_COUNTER=$((${MEMORY_UPDATE_COUNTER} - 1)) - ${XE_UPDATE_GUEST_ATTRS} ${MEMORY} - - sleep ${XE_DAEMON_RATE} -done diff --git a/systemvm/patches/debian/xe/xe-linux-distribution b/systemvm/patches/debian/xe/xe-linux-distribution deleted file mode 100644 index 774f1c7..0000000 --- a/systemvm/patches/debian/xe/xe-linux-distribution +++ /dev/null @@ -1,267 +0,0 @@ -#! /bin/sh - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# Script to write information about the current distribution to stdout or a file. -# Information collected: -# - Distribution name -# - Distribution version (major and minor) -# - Kernel version (uname) - -LANG="C" -export LANG - - -write_to_output() -{ - local distro="$1" - local major="$2" - local minor="$3" - local name="$4" - local uname=$(uname -r) - - if [ -n "${TEST_RESULT}" ] ; then - MAJOR=$major - MINOR=$minor - DISTRO=$distro - UNAME=$uname - return 0 - fi - - echo "os_distro=\"${distro}\"" - echo "os_majorver=\"${major}\"" - echo "os_minorver=\"${minor}\"" - echo "os_uname=\"${uname}\"" - echo "os_name=\"${name}\"" - - return 0 -} - -identify_debian() -{ - local debian_version="$1" - local major - local minor - - # 3.1 - # 4.0 - # Ignores testing and unstable which contain ".*/sid". - - if [ ! -f "${debian_version}" ] ; then - return 1 - fi - - eval $(awk -F. '/^[0-9]*\.[0-9]*/ \ - { print "major="$1 ; print "minor="$2 ; exit 0 }' \ - "${debian_version}") - - if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then - return 1 - fi - - write_to_output "debian" "${major}" "${minor}" "Debian $(head -n 1 $debian_version)" - - return 0 -} - -identify_redhat() -{ - redhat_release="$1" - local distro - local major - local minor - local beta - - # distro=rhel - # Red Hat Enterprise Linux AS release 3 (Taroon Update 6) - # Red Hat Enterprise Linux AS release 3 (Taroon Update 8) - # Red Hat Enterprise Linux AS release 4 (Nahant) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 1) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 2) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 3) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 4) - # Red Hat Enterprise Linux Server release 4.92 (Tikanga) - # Red Hat Enterprise Linux Server release 5 (Tikanga) - # Red Hat Enterprise Linux Server release 5.1 Beta (Tikanga) - - # distro=xe-ddk - # \@PRODUCT_BRAND\@ DDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@) - # Rio DDK release 0.5.6-2991c (xenenterprise) - - # distro=xe-sdk - # \@PRODUCT_BRAND\@ SDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@) - # Rio SDK release 0.5.6-2991c (xenenterprise) - - # distro=fedora - # Fedora Core release 3 (Heidelberg) - - # distro=centos - # CentOS release 4.0 (Final) - # CentOS release 5 (Final) - - # distro=oracle - # Enterprise Linux Enterprise Linux Server release 5 (Carthage) - - if [ ! -f "${redhat_release}" ] ; then - return 1 - fi - - eval $(sed -n \ - -e 's/^\(.*\) DDK release \(.*\)-\(.*\) (.*)$/distro=xe-ddk;major=\2;minor=\3/gp;' \ - -e 's/^\(.*\) SDK release \(.*\)-\(.*\) (.*)$/distro=xe-sdk;major=\2;minor=\3/gp;' \ - -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\) (.* Update \(.*\))$/distro=rhel;major=\1;minor=\2/gp;'\ - -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\) (.*)$/distro=rhel;major=\1/gp;' \ - -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) \([Bb]eta \)\?(.*)$/distro=rhel;major=\1;minor=\2;beta=\3;/gp;' \ - -e 's/^Fedora.*release \([0-9]*\) (.*)$/distro=fedora;major=\1/gp;' \ - -e 's/^CentOS release \([0-9]*\)\.\([0-9]*\) (.*)/distro=centos;major=\1;minor=\2/gp;' \ - -e 's/^CentOS release \([0-9]*\) (.*)/distro=centos;major=\1/gp;' \ - -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=oracle;major=\1;minor=\2;/gp;' \ - -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\) (.*)$/distro=oracle;major=\1/gp;' \ - "${redhat_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - # HACK to handle RHEL betas - if [ "${distro}" == "rhel" ] && [ ${minor} -gt 90 ] ; then - major=$(expr ${major} + 1 ) - minor=0 - beta=Beta - fi - - if [ -n "${beta}" ] ; then - minor="${minor}beta" - fi - - write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${redhat_release})" - -} - -identify_sles() -{ - suse_release="$1" - local major - local minor - local _major - - # SUSE LINUX Enterprise Server 9 (i586) - # VERSION = 9 - # - # SUSE LINUX Enterprise Server 9 (i586) - # VERSION = 9 - # PATCHLEVEL = 2 - # - # SUSE LINUX Enterprise Server 9 (i586) - # VERSION = 9 - # PATCHLEVEL = 3 - # - # SUSE Linux Enterprise Server 10 (i586) - # VERSION = 10 - # - # SUSE Linux Enterprise Server 10 (i586) - # VERSION = 10 - # PATCHLEVEL = 1 - # - # SUSE Linux Enterprise Server 11 (i586) - # VERSION = 11 - # PATCHLEVEL = 0 - - if [ ! -f "${suse_release}" ] ; then - return 1 - fi - - eval $(sed -n \ - -e 's/^SUSE L\(inux\|INUX\) Enterprise Server \([0-9]*\) (.*)/_major=\2;/gp;' \ - -e 's/^VERSION = \([0-9]*\)$/major=\1;/gp;' \ - -e 's/^PATCHLEVEL = \([0-9]*\)$/minor=\1;/gp;' \ - "${suse_release}") - - if [ -z "${major}" -o -z "${_major}" ] ; then - return 1 - fi - - if [ "${major}" != "${_major}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - write_to_output "sles" "${major}" "${minor}" "$(head -n 1 ${suse_release})" - -} - -identify_lsb() -{ - lsb_release="$1" - - if [ ! -x "${lsb_release}" ] ; then - saved_IFS=$IFS - IFS=: - for i in $PATH ; do - if [ -x "${i}/${lsb_release}" ] ; then - lsb_release="${i}/${lsb_release}" - break - fi - done - IFS=$saved_IFS - fi - - if [ ! -x "${lsb_release}" ] ; then - return 1 - fi - - distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z') - description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g') - release=$(${lsb_release} --short --release) - - if [ -z "${distro}" -o -z "${release}" ] ; then - return 1 - fi - - eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }') - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - write_to_output "${distro}" "${major}" "${minor}" "${description}" -} - -if [ $# -eq 1 ] ; then - exec 1>"$1" -fi - -if [ -z "${TEST}" ] ; then - identify_redhat /etc/redhat-release && exit 0 - identify_sles /etc/SuSE-release && exit 0 - identify_lsb lsb_release && exit 0 - identify_debian /etc/debian_version && exit 0 - - if [ $# -eq 1 ] ; then - rm -f "$1" - fi - - exit 1 -fi diff --git a/systemvm/patches/debian/xe/xe-update-guest-attrs b/systemvm/patches/debian/xe/xe-update-guest-attrs deleted file mode 100644 index 6c605be..0000000 --- a/systemvm/patches/debian/xe/xe-update-guest-attrs +++ /dev/null @@ -1,226 +0,0 @@ -#!/bin/sh - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# Script to write information about the guest to XenStore. -# -# Information collected (if --memory NOT passed in): -# - Distribution name -# - Distribution version (major and minor) -# - Kernel version (uname) -# - IP address for each Ethernet interface -# -# Information collected (if --memory IS passed in): -# - memtotal -# - memfree -# -# Memory stats are separated out because they change all the time -# and so we may not want to update them as frequently - -LANG="C" -export LANG - - -XE_LINUX_DISTRIBUTION_CACHE=/var/cache/xe-linux-distribution - -IPADDR_RE="\([[:digit:]]\{1,3\}\.\)\{3\}[[:digit:]]\{1,3\}" - -export PATH=/usr/sbin:/usr/bin:/sbin:/bin -XENSTORE=${XENSTORE:-xenstore} - -XENSTORE_UPDATED=0 - -# parse command line opts - -MEMORY_MODE=0 # do not update memory stats -while [ $# -ge 1 ] ; do - if [ "$1" = "--memory" ] ; then - MEMORY_MODE=1 # update only memory stats - fi - shift -done - -xenstore_write_cached() { - key="$1" newval="$2" - cache=/var/cache/xenstore/$key - if [ -f $cache ] ; then - # cache exists - oldval=$(cat "$cache") - if [ "$oldval" = "$newval" ] ; then - # value unchanged - return 0 - fi - else - # cache does not exist - if [ -e $cache ] ; then - # something (directory?) in its way - rm -rf $cache - fi - fi - - # try to write and update cache if successfull - if $XENSTORE-write "$key" "$newval" ; then - mkdir -p $(dirname "$cache") - echo -n "$newval" > "$cache" - XENSTORE_UPDATED=1 - return 0 - fi - return 1 -} - -# If we detect a domain change then delete our cache and force a refresh -domid=$(xenstore-read "domid") -cache=/var/cache/xenstore/unique-domain-id -newval=$(xenstore-read "/local/domain/${domid}/unique-domain-id") -if [ -e $cache ]; then - oldval=$(cat "$cache") - if [ "$oldval" != "$newval" ]; then - # domain changed - rm -rf /var/cache/xenstore - fi -fi -mkdir -p $(dirname "$cache") -echo -n "$newval" > "$cache" - -xenstore_rm_cached() { - key="$1" - cache=/var/cache/xenstore/$key - if [ ! -e $cache ] ; then - return 1 - fi - # try to write and update cache if successfull - if $XENSTORE-rm "$key" ; then - rm -rf "$cache" - XENSTORE_UPDATED=1 - return 0 - fi - return 1 -} - -xenstore_list_interfaces_cached() { - topdir=/var/cache/xenstore/attr - if [ -d $topdir ] ; then - cd $topdir - for dir in * ; do - [ -f $dir/ip ] && echo $dir - done - fi -} - -if [ $MEMORY_MODE -eq 1 ] ; then - # Update the memory information - eval $(cat /proc/meminfo | \ - sed -n -e 's/MemTotal\: *\([0-9]*\)[^$]*/memtotal=\1/gp;' \ - -e 's/MemFree\: *\([0-9]*\)[^$]*/memfree=\1/gp;') - - xenstore_write_cached "data/meminfo_total" "${memtotal}" - xenstore_write_cached "data/meminfo_free" "${memfree}" -fi - - - -# e.g. -# $ ip addr show -# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue -# link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 -# inet 127.0.0.1/8 scope host lo -# inet6 ::1/128 scope host -# valid_lft forever preferred_lft forever -# 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000 -# link/ether 00:13:20:95:e8:74 brd ff:ff:ff:ff:ff:ff -# inet 172.31.0.57/20 brd 172.31.15.255 scope global eth0 -# inet6 fe80::213:20ff:fe95:e874/64 scope link -# valid_lft forever preferred_lft forever -# 3: sit0: <NOARP> mtu 1480 qdisc noop -# link/sit 0.0.0.0 brd 0.0.0.0 - -#eval $(ip addr show | \ -# sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/ifs="\$ifs \1"; current="\1"; /gp;' \ -# -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;') - -# e.g. -# eth0 Link encap:Ethernet HWaddr 00:13:20:95:E8:74 -# inet addr:172.31.0.57 Bcast:172.31.15.255 Mask:255.255.240.0 -# inet6 addr: fe80::213:20ff:fe95:e874/64 Scope:Link -# UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 -# RX packets:98001128 errors:0 dropped:0 overruns:0 frame:0 -# TX packets:87728920 errors:0 dropped:0 overruns:0 carrier:0 -# collisions:0 txqueuelen:1000 -# RX bytes:35864034092 (33.4 GiB) TX bytes:27544025180 (25.6 GiB) -# Interrupt:177 -# -# lo Link encap:Local Loopback -# inet addr:127.0.0.1 Mask:255.0.0.0 -# inet6 addr: ::1/128 Scope:Host -# UP LOOPBACK RUNNING MTU:16436 Metric:1 -# RX packets:32928 errors:0 dropped:0 overruns:0 frame:0 -# TX packets:32928 errors:0 dropped:0 overruns:0 carrier:0 -# collisions:0 txqueuelen:0 -# RX bytes:3604609 (3.4 MiB) TX bytes:3604609 (3.4 MiB) - -eval $(/sbin/ifconfig | \ - sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \ - -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \ - -e 's/ *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;') - -# network -for if in $ifs ; do - - [ "${if}" = "lo" ] && continue - inet=$(eval echo \${inet_${if}}) - [ -z "${inet}" ] && continue - - xenstore_write_cached "attr/${if}/ip" "${inet}" -done - -# remove any interfaces that have been unplugged or downed -for at in $(xenstore_list_interfaces_cached) ; do - for if in $ifs ; do - [ "${if}" = "${at}" ] && continue 2 - done - xenstore_rm_cached "attr/${at}" -done - -# distro -if [ -f ${XE_LINUX_DISTRIBUTION_CACHE} ] ; then - . ${XE_LINUX_DISTRIBUTION_CACHE} - for key in os_name os_majorver os_minorver os_uname os_distro ; do - new=$(eval echo \${${key}}) - [ -n "${new}" ] || continue - xenstore_write_cached "data/${key}" "${new}" - done -fi - -# whether I support ballooning or not -xenstore_write_cached "control/feature-balloon" "1" - -# whether I support ballooning or not -xenstore_write_cached "control/feature-balloon" "1" - -# build time addons -xenstore_write_cached "attr/PVAddons/MajorVersion" "5" -xenstore_write_cached "attr/PVAddons/MinorVersion" "6" -xenstore_write_cached "attr/PVAddons/MicroVersion" "0" -xenstore_write_cached "attr/PVAddons/BuildVersion" "31188" -xenstore_write_cached "attr/PVAddons/Installed" "1" - -# update xenstore if necc -if [ $XENSTORE_UPDATED -eq 1 ] ; then - xenstore_write_cached "data/updated" "$(date)" -fi - diff --git a/systemvm/pom.xml b/systemvm/pom.xml index 4d657b7..f617495 100644 --- a/systemvm/pom.xml +++ b/systemvm/pom.xml @@ -119,23 +119,12 @@ <fileset dir="${basedir}/patches/debian/vpn/"> <include name="**/*" /> </fileset> - <fileset dir="${basedir}/patches/debian/xe/"> - <include name="**/*" /> - <exclude name="**/xe-*" /> - <exclude name="**/xen-*" /> - </fileset> </copy> <copy overwrite="true" todir="${basedir}/target/build-patch/opt/cloud/bin/"> <fileset dir="${basedir}/../scripts/util/"> <include name="**/keystore-*" /> </fileset> </copy> - <copy overwrite="true" todir="${basedir}/target/build-patch/usr/sbin/"> - <fileset dir="${basedir}/patches/debian/xe/"> - <include name="**/xe-*" /> - <include name="**/xen-*" /> - </fileset> - </copy> <tar destfile="${basedir}/target/patch.tar"> <tarfileset dir="${basedir}/target/build-patch/" filemode="755"> diff --git a/systemvm/vm-script/vmops b/systemvm/vm-script/vmops deleted file mode 100644 index a9f70c8..0000000 --- a/systemvm/vm-script/vmops +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# -# vmops Script to start and stop the VMOps Agent. -# -# Author: Chiradeep Vittal <[email protected]> -# chkconfig: 2345 99 01 -# description: Start up the VMOps agent - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -# Source function library. -if [ -f /etc/init.d/functions ] -then - . /etc/init.d/functions -fi - -_success() { - if [ -f /etc/init.d/functions ] - then - success - else - echo "Success" - fi -} - -_failure() { - if [ -f /etc/init.d/functions ] - then - failure - else - echo "Failed" - fi -} -RETVAL=$? -VMOPS_HOME="/usr/local/vmops" - -mkdir -p /var/log/vmops - -get_pids() { - local i - for i in $(ps -ef| grep java | grep -v grep | awk '{print $2}'); - do - echo $(pwdx $i) | grep "$VMOPS_HOME" | grep -i console | awk -F: '{print $1}'; - done -} - -start() { - local pid=$(get_pids) - echo -n "Starting VMOps Console Proxy: " - if [ -f $VMOPS_HOME/consoleproxy/run.sh ]; - then - if [ "$pid" == "" ] - then - (cd $VMOPS_HOME/consoleproxy; nohup ./run.sh > /var/log/vmops/vmops.out 2>&1 & ) - pid=$(get_pids) - echo $pid > /var/run/vmops.pid - fi - _success - else - _failure - fi - echo -} - -stop() { - local pid - echo -n "Stopping VMOps agent: " - for pid in $(get_pids) - do - kill $pid - done - _success - echo -} - -status() { - local pids=$(get_pids) - if [ "$pids" == "" ] - then - echo "VMOps agent is not running" - return 1 - fi - echo "VMOps agent is running: process id: $pids" - return 0 -} - - -case "$1" in - start) start - ;; - stop) stop - ;; - status) status - ;; - restart) stop - start - ;; - *) echo $"Usage: $0 {start|stop|status|restart}" - exit 1 - ;; -esac - -exit $RETVAL -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
