diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | hald/freebsd/libprobe/Makefile.am | 2 | ||||
| -rw-r--r-- | hald/linux/addons/addon-cpufreq.c | 2 | ||||
| -rw-r--r-- | hald/linux/blockdev.c | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/configure.in b/configure.in index c213345d..2e947a7a 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" dbus_module="dbus-1 >= 0.61" -blkid_module="blkid >= 1.43" +blkid_module="blkid >= 2.15" polkit_module="polkit >= 0.5" # libtool versioning - this applies to libhal and libhal-storage @@ -686,7 +686,7 @@ else fi AC_MSG_RESULT($have_glib_2_14) -# blkid +# blkid (util-linux-ng) case "$host" in *-*-solaris*) ;; diff --git a/hald/freebsd/libprobe/Makefile.am b/hald/freebsd/libprobe/Makefile.am index 20f87889..f0a8211d 100644 --- a/hald/freebsd/libprobe/Makefile.am +++ b/hald/freebsd/libprobe/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ @DBUS_CFLAGS@ if HALD_COMPILE_FREEBSD -lib_LTLIBRARIES = libhald_freebsd_probe.la +noinst_LTLIBRARIES = libhald_freebsd_probe.la endif libhald_freebsd_probe_la_SOURCES = \ diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c index 2669d3ae..2adda366 100644 --- a/hald/linux/addons/addon-cpufreq.c +++ b/hald/linux/addons/addon-cpufreq.c @@ -408,7 +408,7 @@ static gboolean ondemand_set_consider_nice(void *data, gboolean consider) consider_file = g_strdup_printf(ONDEMAND_IGNORE_NICE_LOAD_FILE, iface->base_cpu); if(!write_line(consider_file, "%u", !consider)){ - HAL_WARNING(("Could not set ignore_nice_load to: %u kHz; %s", consider, + HAL_WARNING(("Could not set ignore_nice_load to: %u; %s", consider, strerror(errno))); g_free(consider_file); return FALSE; diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c index 310b3cc7..7ae91bbd 100644 --- a/hald/linux/blockdev.c +++ b/hald/linux/blockdev.c @@ -878,7 +878,7 @@ error: } -void + hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_file, gboolean is_partition, HalDevice *parent, void *end_token) { @@ -893,6 +893,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f gboolean is_md_device; gboolean is_cciss_device; int md_number; + char tc; is_device_mapper = FALSE; is_fakevolume = FALSE; @@ -911,7 +912,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f HAL_INFO (("Handling %s as fakevolume - sysfs_path_real=%s", device_file, sysfs_path_real)); is_fakevolume = TRUE; sysfs_path_real = hal_util_get_parent_path (sysfs_path); - } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d", &md_number) == 1) { + } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d%c", &md_number, &tc) == 1) { HAL_INFO (("Handling %s as MD device", device_file)); is_md_device = TRUE; sysfs_path_real = g_strdup (sysfs_path); |