diff -pur util-linux-2.12r/mount.orig/fstab.c util-linux-2.12r/mount/fstab.c --- util-linux-2.12r/mount.orig/fstab.c 2004-12-21 20:09:24.000000000 +0100 +++ util-linux-2.12r/mount/fstab.c 2005-11-10 08:53:42.000000000 +0100 @@ -296,7 +296,7 @@ has_uuid(const char *device, const char const char *devuuid; int ret; - devuuid = mount_get_devname_by_uuid(device); + devuuid = mount_get_volume_uuid_by_spec(device); ret = !strcmp(uuid, devuuid); /* free(devuuid); */ return ret; Only in util-linux-2.12r/mount: fstab.c~ diff -pur util-linux-2.12r/mount.orig/mount_blkid.c util-linux-2.12r/mount/mount_blkid.c --- util-linux-2.12r/mount.orig/mount_blkid.c 2004-12-22 10:54:41.000000000 +0100 +++ util-linux-2.12r/mount/mount_blkid.c 2005-11-10 08:55:00.000000000 +0100 @@ -16,6 +16,11 @@ mount_blkid_put_cache(void) { } const char * +mount_get_volume_uuid_by_spec(const char *spec) { + return blkid_get_tag_value(blkid, "UUID", spec); +} + +const char * mount_get_volume_label_by_spec(const char *spec) { return blkid_get_tag_value(blkid, "LABEL", spec); } @@ -56,6 +61,11 @@ mount_blkid_put_cache(void) { } const char * +mount_get_volume_uuid_by_spec(const char *spec) { + return xstrdup(get_volume_uuid_by_spec(spec)); +} + +const char * mount_get_volume_label_by_spec(const char *spec) { return xstrdup(get_volume_label_by_spec(spec)); } Only in util-linux-2.12r/mount: mount_blkid.c~ diff -pur util-linux-2.12r/mount.orig/mount_blkid.h util-linux-2.12r/mount/mount_blkid.h --- util-linux-2.12r/mount.orig/mount_blkid.h 2004-04-13 22:00:02.000000000 +0200 +++ util-linux-2.12r/mount/mount_blkid.h 2005-11-10 08:55:21.000000000 +0100 @@ -7,6 +7,7 @@ extern void mount_blkid_get_cache(void); extern void mount_blkid_put_cache(void); extern const char *mount_get_devname_by_uuid(const char *uuid); extern const char *mount_get_devname_by_label(const char *label); +extern const char *mount_get_volume_uuid_by_spec(const char *spec); extern const char *mount_get_volume_label_by_spec(const char *spec); extern const char *mount_get_devname(const char *spec); extern const char *mount_get_devname_for_mounting(const char *spec); Only in util-linux-2.12r/mount: mount_blkid.h~