[Pkg-xen-changes] r70 - trunk/xen-3.0/debian
Ralph Passgang
tha-guest at costa.debian.org
Fri Mar 3 18:08:49 UTC 2006
Author: tha-guest
Date: 2006-03-03 18:08:48 +0000 (Fri, 03 Mar 2006)
New Revision: 70
Modified:
trunk/xen-3.0/debian/changelog
trunk/xen-3.0/debian/control
trunk/xen-3.0/debian/xen-utils-3.0.postinst
Log:
The "Sorry for the step back, but I guess it's more a 2 steps forwards" commit
- Added the xen package again, because we believe there is a valid
upgrade procedure. This helps the user to easily upgrade a xen2 system
and to install a complete xen system (consisting of hypervisor & tools)
by installing the xen "meta-package".
- Removed the Suggestion for KERNEL-xen0-2.6, because we work for unstable+etch
- Changed the udev conflict to the correct syntax
- Changed the "Conflicts: xen" to "Conflicts: xen (<< 3.0.1)" to solve
the upgrade problem with overwritting files from adam's xen2 packages
as well as to have "xen" still installable.
- Made the xen-utils-3.0.postinst script more fault-tolerant, because
of xend cannot start when a xen2 hypervisor is running (to not leave a
broken system, when users are trying to upgrade from xen2 to xen3)
Modified: trunk/xen-3.0/debian/changelog
===================================================================
--- trunk/xen-3.0/debian/changelog 2006-03-03 13:51:35 UTC (rev 69)
+++ trunk/xen-3.0/debian/changelog 2006-03-03 18:08:48 UTC (rev 70)
@@ -37,6 +37,9 @@
- Added "Conflicts: udev (< 0.059)" for xen-utils-3.0
- xen-utils-3.0 now provides xen-utils and xen-hypervisor-3.0 &
xen-hypervisor-3.0-i386-pae now provides xen-hypervisor
+ - Made xen-utils-3.0.postinst more fault-tolerant, so that upgrading
+ xen2 -> xen3 don't fail because of a running xen2 hypervisor
+ - Updated the "Replaces & Conflicts" to a versioned conflict.
* Jeremy T. Bouse <jbouse at debian.org>
- Renamed xen-hypervisor -> xen-hypervisor-3.0
- Renamed xen-hypervisor-pae -> xen-hypervisor-3.0-i386-pae
Modified: trunk/xen-3.0/debian/control
===================================================================
--- trunk/xen-3.0/debian/control 2006-03-03 13:51:35 UTC (rev 69)
+++ trunk/xen-3.0/debian/control 2006-03-03 18:08:48 UTC (rev 70)
@@ -6,13 +6,27 @@
Standards-Version: 3.6.2.2
Build-Depends: tetex-bin, tetex-extra, gs-common, debhelper (>= 4), libcurl3-dev | libcurl-dev, dh-kpatches, python-dev, python (>= 2.2), transfig, libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, bcc, dpatch
+Package: xen
+Section: misc
+Architecture: i386 amd64
+Depends: xen-utils, xen-hypervisor
+Suggests: xen-tools
+Description: a Virtual Machine Monitor like VMWare or plex86
+ XEN is a Virtual Machine Monitor (VMM) originally developed by the
+ Systems Research Group of the University of Cambridge Computer
+ Laboratory, as part of the UK-EPSRC funded XenoServers project.
+ .
+ Xen enables multiple operating system images to execute concurrently
+ on the same hardware with very low performance overhead --- much lower
+ than commercial offerings for the same x86 platform.
+
Package: xen-hypervisor-3.0
Section: misc
Architecture: i386 amd64
Depends: ${shlibs:Depends}
-Suggests: linux-xen0-2.6 | kernel-xen0-2.6
+Suggests: linux-xen0-2.6
Provides: xen-hypervisor
-Conflicts: xen
+Conflicts: xen (<< 3.0.1)
Replaces: xen
Recommends: grub
Description: The Xen Hypervisor
@@ -32,9 +46,9 @@
Section: misc
Architecture: i386
Depends: ${shlibs:Depends}
-Suggests: linux-xen0-2.6 | kernel-xen0-2.6
+Suggests: linux-xen0-2.6
Provides: xen-hypervisor-3.0, xen-hypervisor
-Conflicts: xen
+Conflicts: xen (<< 3.0.1)
Replaces: xen
Recommends: grub
Description: The Xen Hypervisor (pae enabled version)
@@ -57,7 +71,7 @@
Depends: xen-hypervisor-3.0, python-twisted, python, libxen-python, iproute, hotplug | udev, ${shlibs:Depends}
Recommends: bridge-utils
Provides: xen-utils
-Conflicts: udev (< 0.059)
+Conflicts: udev (<< 0.059)
Description: XEN administrative tools
The userspace tools to manage a system virtualized through the XEN virtual
machine monitor.
@@ -95,4 +109,3 @@
This python library wraps the C library, and provides a nice OO interface
to the low-level system calls. It also provides some higher-level config
file parsing.
-
Modified: trunk/xen-3.0/debian/xen-utils-3.0.postinst
===================================================================
--- trunk/xen-3.0/debian/xen-utils-3.0.postinst 2006-03-03 13:51:35 UTC (rev 69)
+++ trunk/xen-3.0/debian/xen-utils-3.0.postinst 2006-03-03 18:08:48 UTC (rev 70)
@@ -18,8 +18,8 @@
fi
update-rc.d xend start 20 2 3 4 5 . stop 21 0 1 6 .
-invoke xend start
+invoke xend start || true
update-rc.d xendomains start 21 2 3 4 5 . stop 20 0 1 6 .
-invoke xendomains start
+invoke xendomains start || true
#DEBHELPER#
More information about the Pkg-xen-changes
mailing list