pool/xen
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=33

Browse Source
This commit is contained in:
OBS User unknown 2007-09-13 22:50:00 +00:00 committed by Git OBS Bridge
parent 12afd35016
commit 8749f77d2e
5 changed files with 45 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
network-multinet
View File

@ -2,8 +2,8 @@
#============================================================================
# network-multinet
#
# Version = 1.3.1
# Date = 2007-08-29
# Version = 1.3.2
# Date = 2007-09-04
#
# Maintainer(s) = Ron Terry - ron (at) pronetworkconsulting (dot) com
#
@ -814,7 +814,10 @@ case $CMD_OPT in
;;
status)
show_xend_network_status
$XEN_DHCP_SCRIPT status
if [ -e $XEN_DHCP_SCRIPT ]
then
$XEN_DHCP_SCRIPT status
fi
;;
esac

43
sysconfig.xend
View File

@ -60,46 +60,3 @@ EMPTY_BRIDGE_LIST="4"
#
NAT_EXTERNAL_INTERFACE="eth0"
## Type: boolean
## Default: "false"
## Config:
#
# If set to true the xend-relocation script will enable/disable
# the vm migration feature of xend..
#
ENABLE_RELOCATION="false"
## Type: list()
## Default: "any"
## Config:
#
# Space delimited list of IP addresses/host names of machines
# that xen will accept vm migrations from. If set to 'any'
# xen will accept vm migrations from any host
#
# Example: "10.0.0.1 10.0.0.2" would allow relocation to/from thos IPs
# Example: "any" would allow reloaction to/from any host
#
RELOCATION_NODELIST="any"
## Type: boolean
## Default: "false"
## Config:
#
# If set to true the xend-relocation script will attempt to
# enable/disable vm migration on all relocation nodes listed
# in the RELOCATION_LIST variable.
#
# Note: Communication with the nodes is done via ssh so
# pre-distributed ssh keys is recommended.
#
MANAGE_ALL_RELOCATION_NODES="false"
## Type: integer
## Default: "8002"
## Config:
#
# The TCP port used by Xen for VM relocation
#
XEN_RELOCATION_PORT="8002"

12
xen.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 13 11:26:33 MDT 2007 - ccoffing@novell.com
- #310338: Fix "No such file or directory" in network-multinet
-------------------------------------------------------------------
Wed Sep 12 18:04:33 MDT 2007 - jfehlig@novell.com
- #309940: Fix 'xm reboot'
- Moved hvm_vnc.diff and xend_mem_leak.diff to 'Upstream patches'
section of spec file since both have been accepted upstream now.
-------------------------------------------------------------------
Mon Sep 10 10:02:36 MDT 2007 - jfehlig@novell.com

21
xen.spec
View File

@ -34,10 +34,10 @@ BuildRequires: glibc-32bit glibc-devel-32bit
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
Version: 3.1.0_15042
Release: 42
Release: 45
License: GPL v2 only
Group: System/Kernel
Autoreqprov: on
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
Source0: xen-3.1-testing-src.tar.bz2
@ -110,6 +110,8 @@ Patch49: 15691-hvm-save-restore.patch
Patch50: 15693-32on64-gnttab-err.patch
Patch51: 15716_dev_detach.patch
Patch52: fix_15716.patch
Patch53: hvm_vnc.diff
Patch54: xend_mem_leak.diff
# Our patches
Patch100: xen-config.diff
Patch101: xend-config.diff
@ -157,8 +159,7 @@ Patch153: bridge-vlan.diff
Patch154: pci-passthru-reboot-fix.patch
Patch155: keymap_nl-be.patch
Patch156: svm-cr8-performance.diff
Patch157: hvm_vnc.diff
Patch158: xend_mem_leak.diff
Patch157: xend-reboot.diff
# Patches from Jan
Patch200: inval-sh-ldt.patch
Patch201: 32on64-cpuid.patch
@ -191,7 +192,7 @@ Patch227: x86_64-syscall-clear-df.patch
Patch228: 32on64-extra-mem.patch
Patch229: blktap.patch
Patch230: dmi-table.patch
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
%if %{?with_kmp}0
@ -615,6 +616,8 @@ Authors:
%patch50 -p1
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
@ -662,7 +665,6 @@ Authors:
%patch155 -p1
%patch156 -p1
%patch157 -p1
%patch158 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
@ -934,7 +936,6 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
%{_defaultdocdir}/xen/misc
%{_defaultdocdir}/xen/xmclone.sh
%dir %pysite/xen
%pysite/xen/*
/usr/lib/xen/boot/domUloader.py
@ -1005,6 +1006,12 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/sbin/ldconfig
%changelog
* Thu Sep 13 2007 - ccoffing@novell.com
- #310338: Fix "No such file or directory" in network-multinet
* Wed Sep 12 2007 - jfehlig@novell.com
- #309940: Fix 'xm reboot'
- Moved hvm_vnc.diff and xend_mem_leak.diff to 'Upstream patches'
section of spec file since both have been accepted upstream now.
* Mon Sep 10 2007 - jfehlig@novell.com
- #289283: Fix memory leak in xend
* Fri Sep 07 2007 - jfehlig@novell.com

13
xend-reboot.diff Normal file
View File

@ -0,0 +1,13 @@
diff -ru a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py 2007-09-12 17:54:01.000000000 -0600
+++ b/tools/python/xen/xend/XendDomainInfo.py 2007-09-12 17:55:43.000000000 -0600
@@ -2162,7 +2162,7 @@
raise VmError('Invalid VM Name')
dom = XendDomain.instance().domain_lookup_nr(name)
- if dom and dom.domid != self.domid:
+ if dom and dom.domid and dom.domid != self.domid:
raise VmError("VM name '%s' already exists%s" %
(name,
dom.domid is not None and
Only in b/tools/python/xen/xend: XendDomainInfo.py~