diff options
| author | markd <markd@pkgsrc.org> | 2010-12-26 20:59:31 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2010-12-26 20:59:31 +0000 |
| commit | 915c9441ff0baf13c4e3881c8d4a3f7a5ec1eb76 (patch) | |
| tree | 3f3e1bcb16f43d7b6442bcbcd8658b08ceec7f88 /sysutils/hal/files | |
| parent | 5e115a0e566bf87b64db20e79c024efdd75edfb2 (diff) | |
| download | pkgsrc-915c9441ff0baf13c4e3881c8d4a3f7a5ec1eb76.tar.gz | |
Update to 0.5.14.
Many bugfixes and support for new features.
Diffstat (limited to 'sysutils/hal/files')
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/addons/addon-storage.c | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/devinfo_mass.c | 8 | ||||
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/devinfo_optical.c | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sysutils/hal/files/hald-netbsd/addons/addon-storage.c b/sysutils/hal/files/hald-netbsd/addons/addon-storage.c index 5828d16912e..ed200197283 100644 --- a/sysutils/hal/files/hald-netbsd/addons/addon-storage.c +++ b/sysutils/hal/files/hald-netbsd/addons/addon-storage.c @@ -323,8 +323,8 @@ vid = NULL; /* add volume properties (ignoring dbus errors) */ libhal_device_set_property_bool (ctx, udi, "volume.ignore", FALSE, &error); /* make visible */ - libhal_device_set_property_bool (ctx, udi, "volume.ismounted", FALSE, &error); /* XXX fixme XXX */ - libhal_device_set_property_bool (ctx, udi, "volume.ismounted_readonly", FALSE, &error); /* XXX fixme XXX */ + libhal_device_set_property_bool (ctx, udi, "volume.is_mounted", FALSE, &error); /* XXX fixme XXX */ + libhal_device_set_property_bool (ctx, udi, "volume.is_mounted_readonly", FALSE, &error); /* XXX fixme XXX */ libhal_device_set_property_string (ctx, udi, "volume.fsusage", "filesystem", &error); libhal_device_set_property_string (ctx, udi, "volume.fstype", disc_fstype, &error); libhal_device_set_property_string (ctx, udi, "volume.label", disc_label, &error); diff --git a/sysutils/hal/files/hald-netbsd/devinfo_mass.c b/sysutils/hal/files/hald-netbsd/devinfo_mass.c index 1222f3a7adf..ee77206d322 100644 --- a/sysutils/hal/files/hald-netbsd/devinfo_mass.c +++ b/sysutils/hal/files/hald-netbsd/devinfo_mass.c @@ -1,4 +1,4 @@ -/* $NetBSD: devinfo_mass.c,v 1.3 2009/10/15 00:30:39 jmcneill Exp $ */ +/* $NetBSD: devinfo_mass.c,v 1.4 2010/12/26 20:59:31 markd Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -110,6 +110,8 @@ devinfo_mass_get_fstype(uint8_t fstype) return "ext2"; case FS_NTFS: return "ntfs"; + case FS_APPLEUFS: + return "ffs"; default: return NULL; } @@ -127,6 +129,8 @@ devinfo_mass_get_mbrtype(uint8_t fstype) return MBR_PTYPE_LNXEXT2; case FS_NTFS: return MBR_PTYPE_NTFS; + case FS_APPLEUFS: + return MBR_PTYPE_APPLE_UFS; default: return MBR_PTYPE_UNUSED; } @@ -394,7 +398,7 @@ devinfo_mass_disklabel_add(HalDevice *parent, const char *devnode, char *devfs_p if (strcmp (type, "vfat") == 0) { HAL_INFO (("%s disklabel reports %s but libvolume_id says it is " "%s, assuming disklabel is incorrect", - devpath, devinfo_mass_get_fstype (part->p_fstype))); + devpath, devinfo_mass_get_fstype (part->p_fstype), type)); hal_device_property_set_string (d, "volume.fstype", type); } } diff --git a/sysutils/hal/files/hald-netbsd/devinfo_optical.c b/sysutils/hal/files/hald-netbsd/devinfo_optical.c index 53abb029060..e435f322318 100644 --- a/sysutils/hal/files/hald-netbsd/devinfo_optical.c +++ b/sysutils/hal/files/hald-netbsd/devinfo_optical.c @@ -361,6 +361,7 @@ devinfo_optical_volume_add(HalDevice *parent, const char *devnode, char *devfs_p hal_device_add_capability (d, "block"); hal_device_add_capability (d, "volume"); hal_device_add_capability (d, "volume.disc"); + hal_device_property_set_string (d, "info.category", "volume"); /* block */ sprintf(devstr, "/dev/%s", devnode); |