From 2eb5ed2848d97d17d15704b024f9085ad50e63af Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sun, 17 Jun 2007 07:47:32 +0000
Subject: [PATCH] Change the location of the files to /etc/defaults/uuids and
 /etc/uuids.

---
 lib/libc/uuid/uuid.3             | 6 +++---
 lib/libc/uuid/uuid_name_lookup.c | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3
index ebb843169a..d1ef971389 100644
--- a/lib/libc/uuid/uuid.3
+++ b/lib/libc/uuid/uuid.3
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.6 2005/11/24 07:04:20 ru Exp $
-.\" $DragonFly: src/lib/libc/uuid/uuid.3,v 1.2 2007/06/17 07:35:12 dillon Exp $
+.\" $DragonFly: src/lib/libc/uuid/uuid.3,v 1.3 2007/06/17 07:47:32 dillon Exp $
 .\"
 .Dd January 3, 2005
 .Dt UUID 3
@@ -104,11 +104,11 @@ function will clear its in-memory cache of UUID<->NAME conversions.  The
 next lookup will reload the cache.
 .Sh FILES
 .TP 3n
-\fI/etc/uuids\fR
+\fI/etc/defaults/uuids\fR
 A list of UUIDs and their symbolic names provided by the OS vendor
 .Pp
 .TP 3n
-\fI/etc/uuids.local\fR
+\fI/etc/uuids\fR
 A list of UUIDs and their symbolic names provided by the system administrator
 .Sh RETURN VALUES
 The successful or unsuccessful completion of the function is returned in
diff --git a/lib/libc/uuid/uuid_name_lookup.c b/lib/libc/uuid/uuid_name_lookup.c
index 7f8da9a505..f181ce4ce2 100644
--- a/lib/libc/uuid/uuid_name_lookup.c
+++ b/lib/libc/uuid/uuid_name_lookup.c
@@ -31,7 +31,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/lib/libc/uuid/uuid_name_lookup.c,v 1.2 2007/06/17 07:36:28 dillon Exp $
+ * $DragonFly: src/lib/libc/uuid/uuid_name_lookup.c,v 1.3 2007/06/17 07:47:32 dillon Exp $
  */
 /*
  * Implement UUID-to-NAME and NAME-to-UUID functions
@@ -112,8 +112,11 @@ uuid_addr_lookup(const uuid_t *u, char **strp, uint32_t *status)
 	}
 	if (u) {
 		if (uuid_name_loaded == 0) {
+			/*
+			 * /etc/uuids will override /etc/defaults/uuids
+			 */
 			uuid_loadcache("/etc/uuids");
-			uuid_loadcache("/etc/uuids.local");
+			uuid_loadcache("/etc/defaults/uuids");
 			uuid_name_loaded = 1;
 		}
 		node = uuid_urbtree_RB_LOOKUP_UUID(&uuid_urbroot, u);
-- 
2.41.0