diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-05-20 17:30:52 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-05-20 17:30:52 +0000 |
| commit | 79d518345efabef1d4f20fe39d00c8c008c0ef9b (patch) | |
| tree | f8f170f0131a6242d1cf781574d6c67ee10c11a8 /sysutils/hal | |
| parent | - Fix patch (diff) | |
Fix patching when FIXED_MOUNTPOINTS is defined.
Reported by: many
Diffstat (limited to 'sysutils/hal')
| -rw-r--r-- | sysutils/hal/files/extra-patch-tools_hal-storage-mount.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c index 82a7fb6070e0..f505709e1c50 100644 --- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c +++ b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c @@ -1,16 +1,9 @@ ---- tools/hal-storage-mount.c.orig 2008-01-03 21:10:54.000000000 -0500 -+++ tools/hal-storage-mount.c 2008-01-04 09:29:10.000000000 -0500 -@@ -583,23 +583,11 @@ handle_mount (LibHalContext *hal_ctx, +--- tools/hal-storage-mount.c.orig 2008-05-20 13:24:30.000000000 -0400 ++++ tools/hal-storage-mount.c 2008-05-20 13:30:14.000000000 -0400 +@@ -585,17 +585,11 @@ handle_mount (LibHalContext *hal_ctx, explicit_mount_point_given = FALSE; if (strlen (mount_point) == 0) { char *p; -- const char *label; -+ char *basename; - -- if (volume != NULL) -- label = libhal_volume_get_label (volume); -- else -- label = NULL; - - if (label != NULL) { - /* best - use label */ @@ -22,6 +15,8 @@ - /* fallback - use "disk" */ - g_snprintf (mount_point, sizeof (mount_point), "%s", "disk"); - } ++ char *basename; ++ + basename = g_path_get_basename (device); + g_strlcpy (mount_point, basename, sizeof (mount_point)); + g_free (basename); |