[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.5-2-1-g4d41fd7

[Guido Günther]

The following commit has been merged in the master branch:
commit 4d41fd7ee90084404aede01e4bcde13220bf3fa2
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jan 7 22:20:02 2010 +0100

    Also look for dmi information in /sys/class
    
    older kernels such as 2.6.26 have it there.
    
    Closes: #564020

diff --git a/debian/patches/0005-Also-look-for-dmi-information-in-sys-class.patch b/debian/patches/0005-Also-look-for-dmi-information-in-sys-class.patch
new file mode 100644
index 0000000..ef42c9d
--- /dev/null
+++ b/debian/patches/0005-Also-look-for-dmi-information-in-sys-class.patch
@@ -0,0 +1,41 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 7 Jan 2010 10:13:51 +0100
+Subject: [PATCH] Also look for dmi information in /sys/class
+
+older kernels such as 2.6.26 have it there.
+---
+ src/node_device/node_device_udev.c |    7 ++++++-
+ src/node_device/node_device_udev.h |    1 +
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index 22c5f2b..7a9c1e5 100644
+--- a/src/node_device/node_device_udev.c
++++ b/src/node_device/node_device_udev.c
+@@ -1407,7 +1407,12 @@ static int udevSetupSystemDev(void)
+     device = udev_device_new_from_syspath(udev, DMI_DEVPATH);
+     if (device == NULL) {
+         VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH);
+-        goto out;
++
++        device = udev_device_new_from_syspath(udev, DMI_DEVPATH_FALLBACK);
++        if (device == NULL) {
++            VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH_FALLBACK);
++            goto out;
++        }
+     }
+ 
+     data = &def->caps->data;
+diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h
+index 0fd39ae..6c83412 100644
+--- a/src/node_device/node_device_udev.h
++++ b/src/node_device/node_device_udev.h
+@@ -26,6 +26,7 @@
+ #define SYSFS_DATA_SIZE 4096
+ #define DRV_STATE_UDEV_MONITOR(ds) ((struct udev_monitor *)((ds)->privateData))
+ #define DMI_DEVPATH "/sys/devices/virtual/dmi/id"
++#define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id"
+ #define PROPERTY_FOUND 0
+ #define PROPERTY_MISSING 1
+ #define PROPERTY_ERROR -1
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a8c0f9e..72f2b02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
+0005-Also-look-for-dmi-information-in-sys-class.patch

-- 
Libvirt Debian packaging