[Pkg-xen-changes] r1050 - in branches/wheezy/xen/debian: . scripts

[Bastian Blank]

Author: waldi
Date: Sun Jul  1 13:29:30 2012
New Revision: 1050

Log:
Revert r1041.

Modified:
   branches/wheezy/xen/debian/changelog
   branches/wheezy/xen/debian/scripts/xen-version

Modified: branches/wheezy/xen/debian/changelog
==============================================================================
--- branches/wheezy/xen/debian/changelog	Sun Jul  1 13:28:18 2012	(r1049)
+++ branches/wheezy/xen/debian/changelog	Sun Jul  1 13:29:30 2012	(r1050)
@@ -3,7 +3,6 @@
   * Remove /usr/lib/xen-default. It breaks systems if xenstored is not
     compatible.
   * Fix init script usage.
-  * Remove support for Lenny and earlier.
 
  -- Bastian Blank <waldi at debian.org>  Sun, 17 Jun 2012 23:52:46 +0200
 

Modified: branches/wheezy/xen/debian/scripts/xen-version
==============================================================================
--- branches/wheezy/xen/debian/scripts/xen-version	Sun Jul  1 13:28:18 2012	(r1049)
+++ branches/wheezy/xen/debian/scripts/xen-version	Sun Jul  1 13:29:30 2012	(r1050)
@@ -9,7 +9,16 @@
     type="$(cat /sys/hypervisor/type)"
     if [ "$type" = xen ]; then
         DIR=/sys/hypervisor/version
-        VERSION="$(cat $DIR/major).$(cat $DIR/minor)"
+        VERSION_EXTRA="$(cat $DIR/extra)"
+        if [ "$VERSION_EXTRA" = "-unstable" ]; then
+            # Old xen-unstable
+            VERSION=unstable
+        elif [ "$VERSION_EXTRA" != "${VERSION_EXTRA#-}" ]; then
+            # ABI for Lenny and smaller
+            VERSION="$(cat $DIR/major).$(cat $DIR/minor)$VERSION_EXTRA"
+        else
+            VERSION="$(cat $DIR/major).$(cat $DIR/minor)"
+        fi
     elif [ -z "$type" ]; then
         error "Can't read hypervisor type from sysfs!"
     else