Author: waldi
Date: Sun Nov 22 14:46:50 2009
New Revision: 697
Log:
* debian/changelog: Update.
* debian/xen-utils-common.xend.init:
Check for contents of /proc/xen instead of mount-point.
Modified:
trunk/xen-common/debian/changelog
trunk/xen-common/debian/xen-utils-common.xend.init
Modified: trunk/xen-common/debian/changelog
=============================================================================---
trunk/xen-common/debian/changelog Sun Nov 22 14:38:51 2009 (r696)
+++ trunk/xen-common/debian/changelog Sun Nov 22 14:46:50 2009 (r697)
@@ -2,6 +2,7 @@
* Redefine Xen version tests to allow detection of bare metal.
(closes: #556859)
+ * Support oldstyle Xen kernel without xenfs. (closes: #557151)
-- Bastian Blank <waldi at debian.org> Wed, 18 Nov 2009 13:45:26 +0100
Modified: trunk/xen-common/debian/xen-utils-common.xend.init
=============================================================================---
trunk/xen-common/debian/xen-utils-common.xend.init Sun Nov 22 14:38:51 2009
(r696)
+++ trunk/xen-common/debian/xen-utils-common.xend.init Sun Nov 22 14:46:50 2009
(r697)
@@ -38,7 +38,7 @@
xenfs_setup()
{
- [ "$(awk ''($2 == "/proc/xen") { print $2 }''
/proc/mounts)" ] && return 0
+ [ -e "/proc/xen/capabilities" ] && return 0
log_progress_msg "xenfs"
[ -d "/proc/xen" ] || return 1
mount -t xenfs xenfs /proc/xen || return 1
@@ -47,7 +47,7 @@
capability_check()
{
- [ -d "/proc/xen" ] || return 1
+ [ -e "/proc/xen/capabilities" ] || return 1
grep -q "control_d" /proc/xen/capabilities || return 1
return 0
}